From e31b7cdcd565566e4d5eb96ff9bcaec47316ab77 Mon Sep 17 00:00:00 2001 From: Andreas Auernhammer Date: Tue, 29 Oct 2019 23:36:47 +0100 Subject: [PATCH] madmin: update sio version and use `Algorithm` constants (#8463) This commit bumps the version of the `sio` library from v0.2.0 => v0.3.0. Now, `madmin` can use the `Algorithm` type constants that make the encrypt/decrypt code simpler. --- go.mod | 2 +- go.sum | 4 +-- pkg/madmin/encrypt.go | 84 ++++++++++++++----------------------------- 3 files changed, 30 insertions(+), 60 deletions(-) diff --git a/go.mod b/go.mod index 92f3c65eb..35af4bab6 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 github.com/rjeczalik/notify v0.9.2 github.com/rs/cors v1.6.0 - github.com/secure-io/sio-go v0.2.0 + github.com/secure-io/sio-go v0.3.0 github.com/shirou/gopsutil v2.18.12+incompatible github.com/sirupsen/logrus v1.4.2 github.com/skyrings/skyring-common v0.0.0-20160929130248-d1c0bb1cbd5e diff --git a/go.sum b/go.sum index d761659e1..4ff2c6d23 100644 --- a/go.sum +++ b/go.sum @@ -593,8 +593,8 @@ github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod h1:gi+0 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/secure-io/sio-go v0.2.0 h1:63Oy4FEiYUqUvn/pYX0q/eVB2rimmuK/j3WRpcK219s= -github.com/secure-io/sio-go v0.2.0/go.mod h1:Np6qoCYRnuYMVrvizMS82+JbdOIT5ep43BJa5qGcT1Q= +github.com/secure-io/sio-go v0.3.0 h1:QKGb6rGJeiExac9wSWxnWPYo8O8OFN7lxXQvHshX6vo= +github.com/secure-io/sio-go v0.3.0/go.mod h1:D3KmXgKETffyYxBdFRN+Hpd2WzhzqS0EQwT3XWsAcBU= github.com/segmentio/go-prompt v0.0.0-20161017233205-f0d19b6901ad/go.mod h1:B3ehdD1xPoWDKgrQgUaGk+m8H1xb1J5TyYDfKpKNeEE= github.com/segmentio/go-prompt v1.2.1-0.20161017233205-f0d19b6901ad/go.mod h1:B3ehdD1xPoWDKgrQgUaGk+m8H1xb1J5TyYDfKpKNeEE= github.com/shirou/gopsutil v2.18.12+incompatible h1:1eaJvGomDnH74/5cF4CTmTbLHAriGFsTZppLXDX93OM= diff --git a/pkg/madmin/encrypt.go b/pkg/madmin/encrypt.go index 751396ebc..620bbfe2d 100644 --- a/pkg/madmin/encrypt.go +++ b/pkg/madmin/encrypt.go @@ -19,17 +19,13 @@ package madmin import ( "bytes" - "crypto/aes" - "crypto/cipher" - "crypto/rand" "errors" "io" "io/ioutil" "github.com/secure-io/sio-go" + "github.com/secure-io/sio-go/sioutil" "golang.org/x/crypto/argon2" - "golang.org/x/crypto/chacha20poly1305" - "golang.org/x/sys/cpu" ) // EncryptData encrypts the data with an unique key @@ -39,26 +35,27 @@ import ( // salt | AEAD ID | nonce | encrypted data // 32 1 8 ~ len(data) func EncryptData(password string, data []byte) ([]byte, error) { - salt := make([]byte, 32) - if _, err := io.ReadFull(rand.Reader, salt); err != nil { - return nil, err - } + salt := sioutil.MustRandom(32) // Derive an unique 256 bit key from the password and the random salt. key := argon2.IDKey([]byte(password), salt, 1, 64*1024, 4, 32) - // Create a new AEAD instance - either AES-GCM if the CPU provides - // an AES hardware implementation or ChaCha20-Poly1305 otherwise. - id, cipher, err := newAEAD(key) + var ( + id byte + err error + stream *sio.Stream + ) + if sioutil.NativeAES() { // Only use AES-GCM if we can use an optimized implementation + id = aesGcm + stream, err = sio.AES_256_GCM.Stream(key) + } else { + id = c20p1305 + stream, err = sio.ChaCha20Poly1305.Stream(key) + } if err != nil { return nil, err } - stream := sio.NewStream(cipher, sio.BufSize) - - nonce := make([]byte, stream.NonceSize()) - if _, err := io.ReadFull(rand.Reader, nonce); err != nil { - return nil, err - } + nonce := sioutil.MustRandom(stream.NonceSize()) // ciphertext = salt || AEAD ID | nonce | encrypted data cLen := int64(len(salt)+1+len(nonce)+len(data)) + stream.Overhead(int64(len(data))) @@ -104,11 +101,21 @@ func DecryptData(password string, data io.Reader) ([]byte, error) { } key := argon2.IDKey([]byte(password), salt[:], 1, 64*1024, 4, 32) - cipher, err := parseAEAD(id[0], key) + var ( + err error + stream *sio.Stream + ) + switch id[0] { + case aesGcm: + stream, err = sio.AES_256_GCM.Stream(key) + case c20p1305: + stream, err = sio.ChaCha20Poly1305.Stream(key) + default: + err = errors.New("madmin: invalid AEAD algorithm ID") + } if err != nil { return nil, err } - stream := sio.NewStream(cipher, sio.BufSize) return ioutil.ReadAll(stream.DecryptReader(data, nonce[:], nil)) } @@ -116,40 +123,3 @@ const ( aesGcm = 0x00 c20p1305 = 0x01 ) - -// newAEAD creates a new AEAD instance from the given key. -// If the CPU provides an AES hardware implementation it -// returns an AES-GCM instance. Otherwise it returns a -// ChaCha20-Poly1305 instance. -// -// newAEAD also returns a byte as algorithm ID indicating -// which AEAD scheme it has selected. -func newAEAD(key []byte) (byte, cipher.AEAD, error) { - if (cpu.X86.HasAES && cpu.X86.HasPCLMULQDQ) || cpu.S390X.HasAES || cpu.PPC64.IsPOWER8 || cpu.ARM64.HasAES { - block, err := aes.NewCipher(key) - if err != nil { - return 0, nil, err - } - c, err := cipher.NewGCM(block) - return aesGcm, c, err - } - c, err := chacha20poly1305.New(key) - return c20p1305, c, err -} - -// parseAEAD creates a new AEAD instance from the id and key. -// The id must be either 0 (AES-GCM) or 1 (ChaCha20-Poly1305). -func parseAEAD(id byte, key []byte) (cipher.AEAD, error) { - switch id { - case aesGcm: - block, err := aes.NewCipher(key) - if err != nil { - return nil, err - } - return cipher.NewGCM(block) - case c20p1305: - return chacha20poly1305.New(key) - default: - return nil, errors.New("madmin: invalid AEAD algorithm ID") - } -}