-
Notifications
You must be signed in to change notification settings - Fork 5.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
expression: ECB/CBC modes with 128/192/256-bit key length for AES #7425
Changes from 20 commits
e50e207
3ce847d
f3ba799
2f0de8d
3bf2a60
1c10b19
e9e5fa4
4d5d8a9
817f05a
d206725
58e1efd
4279572
dda3ec7
b4e0ee9
f1e233b
492f94c
d732b47
6cd647f
ec0e07b
7d06fbf
3b8a159
b423fb8
90b51e2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,6 +16,7 @@ package expression | |
import ( | ||
"bytes" | ||
"compress/zlib" | ||
"crypto/aes" | ||
"crypto/md5" | ||
"crypto/rand" | ||
"crypto/sha1" | ||
|
@@ -25,9 +26,11 @@ import ( | |
"fmt" | ||
"hash" | ||
"io" | ||
"strings" | ||
|
||
"github.com/pingcap/tidb/mysql" | ||
"github.com/pingcap/tidb/sessionctx" | ||
"github.com/pingcap/tidb/sessionctx/variable" | ||
"github.com/pingcap/tidb/types" | ||
"github.com/pingcap/tidb/util/auth" | ||
"github.com/pingcap/tidb/util/chunk" | ||
|
@@ -57,7 +60,9 @@ var ( | |
|
||
var ( | ||
_ builtinFunc = &builtinAesDecryptSig{} | ||
_ builtinFunc = &builtinAesDecryptIVSig{} | ||
_ builtinFunc = &builtinAesEncryptSig{} | ||
_ builtinFunc = &builtinAesEncryptIVSig{} | ||
_ builtinFunc = &builtinCompressSig{} | ||
_ builtinFunc = &builtinMD5Sig{} | ||
_ builtinFunc = &builtinPasswordSig{} | ||
|
@@ -68,10 +73,27 @@ var ( | |
_ builtinFunc = &builtinUncompressedLengthSig{} | ||
) | ||
|
||
// TODO: support other mode | ||
const ( | ||
aes128ecbBlobkSize = 16 | ||
) | ||
// ivSize indicates the initialization vector supplied to aes_decrypt | ||
const ivSize = aes.BlockSize | ||
|
||
// aesModeAttr indicates that the key length and iv attribute for specific block_encryption_mode. | ||
// keySize is the key length in bits and mode is the encryption mode. | ||
// ivRequired indicates that initialization vector is required or not. | ||
type aesModeAttr struct { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's better to add some comment about this struct. |
||
modeName string | ||
keySize int | ||
ivRequired bool | ||
} | ||
|
||
var aesModes = map[string]*aesModeAttr{ | ||
//TODO support more modes, permitted mode values are: ECB, CBC, CFB1, CFB8, CFB128, OFB | ||
"aes-128-ecb": {"ecb", 16, false}, | ||
"aes-192-ecb": {"ecb", 24, false}, | ||
"aes-256-ecb": {"ecb", 32, false}, | ||
"aes-128-cbc": {"cbc", 16, true}, | ||
"aes-192-cbc": {"cbc", 24, true}, | ||
"aes-256-cbc": {"cbc", 32, true}, | ||
} | ||
|
||
type aesDecryptFunctionClass struct { | ||
baseFunctionClass | ||
|
@@ -81,20 +103,37 @@ func (c *aesDecryptFunctionClass) getFunction(ctx sessionctx.Context, args []Exp | |
if err := c.verifyArgs(args); err != nil { | ||
return nil, errors.Trace(c.verifyArgs(args)) | ||
} | ||
bf := newBaseBuiltinFuncWithTp(ctx, args, types.ETString, types.ETString, types.ETString) | ||
argTps := make([]types.EvalType, 0, len(args)) | ||
for range args { | ||
argTps = append(argTps, types.ETString) | ||
} | ||
bf := newBaseBuiltinFuncWithTp(ctx, args, types.ETString, argTps...) | ||
bf.tp.Flen = args[0].GetType().Flen // At most. | ||
types.SetBinChsClnFlag(bf.tp) | ||
sig := &builtinAesDecryptSig{bf} | ||
return sig, nil | ||
|
||
blockMode, _ := ctx.GetSessionVars().GetSystemVar(variable.BlockEncryptionMode) | ||
mode, exists := aesModes[strings.ToLower(blockMode)] | ||
if !exists { | ||
return nil, errors.Errorf("unsupported block encryption mode - %v", blockMode) | ||
} | ||
if mode.ivRequired { | ||
if len(args) != 3 { | ||
return nil, ErrIncorrectParameterCount.GenWithStackByArgs("aes_decrypt") | ||
} | ||
return &builtinAesDecryptIVSig{bf, mode}, nil | ||
} | ||
return &builtinAesDecryptSig{bf, mode}, nil | ||
} | ||
|
||
type builtinAesDecryptSig struct { | ||
baseBuiltinFunc | ||
*aesModeAttr | ||
} | ||
|
||
func (b *builtinAesDecryptSig) Clone() builtinFunc { | ||
newSig := &builtinAesDecryptSig{} | ||
newSig.cloneFrom(&b.baseBuiltinFunc) | ||
newSig.aesModeAttr = b.aesModeAttr | ||
return newSig | ||
} | ||
|
||
|
@@ -106,15 +145,73 @@ func (b *builtinAesDecryptSig) evalString(row chunk.Row) (string, bool, error) { | |
if isNull || err != nil { | ||
return "", true, errors.Trace(err) | ||
} | ||
keyStr, isNull, err := b.args[1].EvalString(b.ctx, row) | ||
if isNull || err != nil { | ||
return "", true, errors.Trace(err) | ||
} | ||
if !b.ivRequired && len(b.args) == 3 { | ||
// For modes that do not require init_vector, it is ignored and a warning is generated if it is specified. | ||
b.ctx.GetSessionVars().StmtCtx.AppendWarning(errWarnOptionIgnored.GenWithStackByArgs("IV")) | ||
} | ||
|
||
key := encrypt.DeriveKeyMySQL([]byte(keyStr), b.keySize) | ||
var plainText []byte | ||
switch b.modeName { | ||
case "ecb": | ||
plainText, err = encrypt.AESDecryptWithECB([]byte(cryptStr), key) | ||
default: | ||
return "", true, errors.Errorf("unsupported block encryption mode - %v", b.modeName) | ||
} | ||
if err != nil { | ||
return "", true, nil | ||
} | ||
return string(plainText), false, nil | ||
} | ||
|
||
type builtinAesDecryptIVSig struct { | ||
baseBuiltinFunc | ||
*aesModeAttr | ||
} | ||
|
||
func (b *builtinAesDecryptIVSig) Clone() builtinFunc { | ||
newSig := &builtinAesDecryptIVSig{} | ||
newSig.cloneFrom(&b.baseBuiltinFunc) | ||
newSig.aesModeAttr = b.aesModeAttr | ||
return newSig | ||
} | ||
|
||
// evalString evals AES_DECRYPT(crypt_str, key_key, iv). | ||
// See https://dev.mysql.com/doc/refman/5.7/en/encryption-functions.html#function_aes-decrypt | ||
func (b *builtinAesDecryptIVSig) evalString(row chunk.Row) (string, bool, error) { | ||
// According to doc: If either function argument is NULL, the function returns NULL. | ||
cryptStr, isNull, err := b.args[0].EvalString(b.ctx, row) | ||
if isNull || err != nil { | ||
return "", true, errors.Trace(err) | ||
} | ||
|
||
keyStr, isNull, err := b.args[1].EvalString(b.ctx, row) | ||
if isNull || err != nil { | ||
return "", true, errors.Trace(err) | ||
} | ||
|
||
// TODO: Support other modes. | ||
key := encrypt.DeriveKeyMySQL([]byte(keyStr), aes128ecbBlobkSize) | ||
plainText, err := encrypt.AESDecryptWithECB([]byte(cryptStr), key) | ||
iv, isNull, err := b.args[2].EvalString(b.ctx, row) | ||
if isNull || err != nil { | ||
return "", true, errors.Trace(err) | ||
} | ||
if len(iv) < aes.BlockSize { | ||
return "", true, errIncorrectArgs.GenWithStack("The initialization vector supplied to aes_decrypt is too short. Must be at least %d bytes long", aes.BlockSize) | ||
} | ||
// init_vector must be 16 bytes or longer (bytes in excess of 16 are ignored) | ||
iv = iv[0:aes.BlockSize] | ||
|
||
key := encrypt.DeriveKeyMySQL([]byte(keyStr), b.keySize) | ||
var plainText []byte | ||
switch b.modeName { | ||
case "cbc": | ||
plainText, err = encrypt.AESDecryptWithCBC([]byte(cryptStr), key, []byte(iv)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It seems some duplicate logic in what about use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I add "type blockModeBuild func(block cipher.Block) cipher.BlockMode" to create BlockMode argument. |
||
default: | ||
return "", true, errors.Errorf("unsupported block encryption mode - %v", b.modeName) | ||
} | ||
if err != nil { | ||
return "", true, nil | ||
} | ||
|
@@ -129,20 +226,37 @@ func (c *aesEncryptFunctionClass) getFunction(ctx sessionctx.Context, args []Exp | |
if err := c.verifyArgs(args); err != nil { | ||
return nil, errors.Trace(c.verifyArgs(args)) | ||
} | ||
bf := newBaseBuiltinFuncWithTp(ctx, args, types.ETString, types.ETString, types.ETString) | ||
bf.tp.Flen = aes128ecbBlobkSize * (args[0].GetType().Flen/aes128ecbBlobkSize + 1) // At most. | ||
argTps := make([]types.EvalType, 0, len(args)) | ||
for range args { | ||
argTps = append(argTps, types.ETString) | ||
} | ||
bf := newBaseBuiltinFuncWithTp(ctx, args, types.ETString, argTps...) | ||
bf.tp.Flen = aes.BlockSize * (args[0].GetType().Flen/aes.BlockSize + 1) // At most. | ||
types.SetBinChsClnFlag(bf.tp) | ||
sig := &builtinAesEncryptSig{bf} | ||
return sig, nil | ||
|
||
blockMode, _ := ctx.GetSessionVars().GetSystemVar(variable.BlockEncryptionMode) | ||
mode, exists := aesModes[strings.ToLower(blockMode)] | ||
if !exists { | ||
return nil, errors.Errorf("unsupported block encryption mode - %v", blockMode) | ||
} | ||
if mode.ivRequired { | ||
if len(args) != 3 { | ||
return nil, ErrIncorrectParameterCount.GenWithStackByArgs("aes_encrypt") | ||
} | ||
return &builtinAesEncryptIVSig{bf, mode}, nil | ||
} | ||
return &builtinAesEncryptSig{bf, mode}, nil | ||
} | ||
|
||
type builtinAesEncryptSig struct { | ||
baseBuiltinFunc | ||
*aesModeAttr | ||
} | ||
|
||
func (b *builtinAesEncryptSig) Clone() builtinFunc { | ||
newSig := &builtinAesEncryptSig{} | ||
newSig.cloneFrom(&b.baseBuiltinFunc) | ||
newSig.aesModeAttr = b.aesModeAttr | ||
return newSig | ||
} | ||
|
||
|
@@ -154,15 +268,73 @@ func (b *builtinAesEncryptSig) evalString(row chunk.Row) (string, bool, error) { | |
if isNull || err != nil { | ||
return "", true, errors.Trace(err) | ||
} | ||
keyStr, isNull, err := b.args[1].EvalString(b.ctx, row) | ||
if isNull || err != nil { | ||
return "", true, errors.Trace(err) | ||
} | ||
if !b.ivRequired && len(b.args) == 3 { | ||
// For modes that do not require init_vector, it is ignored and a warning is generated if it is specified. | ||
b.ctx.GetSessionVars().StmtCtx.AppendWarning(errWarnOptionIgnored.GenWithStackByArgs("IV")) | ||
} | ||
|
||
key := encrypt.DeriveKeyMySQL([]byte(keyStr), b.keySize) | ||
var cipherText []byte | ||
switch b.modeName { | ||
case "ecb": | ||
cipherText, err = encrypt.AESEncryptWithECB([]byte(str), key) | ||
default: | ||
return "", true, errors.Errorf("unsupported block encryption mode - %v", b.modeName) | ||
} | ||
if err != nil { | ||
return "", true, nil | ||
} | ||
return string(cipherText), false, nil | ||
} | ||
|
||
type builtinAesEncryptIVSig struct { | ||
baseBuiltinFunc | ||
*aesModeAttr | ||
} | ||
|
||
func (b *builtinAesEncryptIVSig) Clone() builtinFunc { | ||
newSig := &builtinAesEncryptIVSig{} | ||
newSig.cloneFrom(&b.baseBuiltinFunc) | ||
newSig.aesModeAttr = b.aesModeAttr | ||
return newSig | ||
} | ||
|
||
// evalString evals AES_ENCRYPT(str, key_str, iv). | ||
// See https://dev.mysql.com/doc/refman/5.7/en/encryption-functions.html#function_aes-decrypt | ||
func (b *builtinAesEncryptIVSig) evalString(row chunk.Row) (string, bool, error) { | ||
// According to doc: If either function argument is NULL, the function returns NULL. | ||
str, isNull, err := b.args[0].EvalString(b.ctx, row) | ||
if isNull || err != nil { | ||
return "", true, errors.Trace(err) | ||
} | ||
|
||
keyStr, isNull, err := b.args[1].EvalString(b.ctx, row) | ||
if isNull || err != nil { | ||
return "", true, errors.Trace(err) | ||
} | ||
|
||
// TODO: Support other modes. | ||
key := encrypt.DeriveKeyMySQL([]byte(keyStr), aes128ecbBlobkSize) | ||
cipherText, err := encrypt.AESEncryptWithECB([]byte(str), key) | ||
iv, isNull, err := b.args[2].EvalString(b.ctx, row) | ||
if isNull || err != nil { | ||
return "", true, errors.Trace(err) | ||
} | ||
if len(iv) < aes.BlockSize { | ||
return "", true, errIncorrectArgs.GenWithStack("The initialization vector supplied to aes_encrypt is too short. Must be at least %d bytes long", aes.BlockSize) | ||
} | ||
// init_vector must be 16 bytes or longer (bytes in excess of 16 are ignored) | ||
iv = iv[0:aes.BlockSize] | ||
|
||
key := encrypt.DeriveKeyMySQL([]byte(keyStr), b.keySize) | ||
var cipherText []byte | ||
switch b.modeName { | ||
case "cbc": | ||
cipherText, err = encrypt.AESEncryptWithCBC([]byte(str), key, []byte(iv)) | ||
default: | ||
return "", true, errors.Errorf("unsupported block encryption mode - %v", b.modeName) | ||
} | ||
if err != nil { | ||
return "", true, nil | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not used?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a const variable BlockSize in aes package.