@@ -5,6 +5,7 @@ import (
55 "encoding/base64"
66 "fmt"
77 "io"
8+ mathrand "math/rand"
89 "testing"
910
1011 "github.com/stretchr/testify/assert"
@@ -117,6 +118,80 @@ func runEncryptAndDecrypt(t *testing.T, c Cipher, dataSize int) {
117118 assert.NotEqual(t, encrypted, decrypted)
118119}
119120
121+func TestEncryptIntoAndDecryptInto(t *testing.T) {
122+ // Test our 2 cipher types
123+ cipherInits := map[string]func([]byte) (Cipher, error){
124+ "CFB": NewCFBCipher,
125+ "GCM": NewGCMCipher,
126+ }
127+ for name, initCipher := range cipherInits {
128+ t.Run(name, func(t *testing.T) {
129+ // Test all 3 valid AES sizes
130+ for _, secretSize := range []int{16, 24, 32} {
131+ t.Run(fmt.Sprintf("%d", secretSize), func(t *testing.T) {
132+ secret := make([]byte, secretSize)
133+ _, err := io.ReadFull(rand.Reader, secret)
134+ assert.Equal(t, nil, err)
135+
136+ // Test Standard & Base64 wrapped
137+ cstd, err := initCipher(secret)
138+ assert.Equal(t, nil, err)
139+
140+ cb64, err := NewBase64Cipher(initCipher, secret)
141+ assert.Equal(t, nil, err)
142+
143+ ciphers := map[string]Cipher{
144+ "Standard": cstd,
145+ "Base64": cb64,
146+ }
147+
148+ for cName, c := range ciphers {
149+ // Check no errors with empty or nil strings
150+ if cName == "Base64" {
151+ empty := ""
152+ assert.Equal(t, nil, c.EncryptInto(&empty))
153+ assert.Equal(t, nil, c.DecryptInto(&empty))
154+ assert.Equal(t, nil, c.EncryptInto(nil))
155+ assert.Equal(t, nil, c.DecryptInto(nil))
156+ }
157+
158+ t.Run(cName, func(t *testing.T) {
159+ // Test various sizes sessions might be
160+ for _, dataSize := range []int{10, 100, 1000, 5000, 10000} {
161+ t.Run(fmt.Sprintf("%d", dataSize), func(t *testing.T) {
162+ runEncryptIntoAndDecryptInto(t, c, cName, dataSize)
163+ })
164+ }
165+ })
166+ }
167+ })
168+ }
169+ })
170+ }
171+}
172+
173+func runEncryptIntoAndDecryptInto(t *testing.T, c Cipher, cipherType string, dataSize int) {
174+ const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
175+ b := make([]byte, dataSize)
176+ for i := range b {
177+ b[i] = charset[mathrand.Intn(len(charset))]
178+ }
179+ data := string(b)
180+ originalData := data
181+
182+ // Base64 is the only cipher that supports string->string Encrypt/Decrypt Into methods
183+ if cipherType == "Base64" {
184+ assert.Equal(t, nil, c.EncryptInto(&data))
185+ assert.NotEqual(t, originalData, data)
186+
187+ assert.Equal(t, nil, c.DecryptInto(&data))
188+ assert.Equal(t, originalData, data)
189+ } else {
190+ assert.NotEqual(t, nil, c.EncryptInto(&data))
191+ assert.NotEqual(t, nil, c.DecryptInto(&data))
192+ }
193+}
194+
120195func TestDecryptCFBWrongSecret(t *testing.T) {
121196 secret1 := []byte("0123456789abcdefghijklmnopqrstuv")
122197 secret2 := []byte("9876543210abcdefghijklmnopqrstuv")
@@ -228,25 +303,3 @@ func TestCFBtoGCMErrors(t *testing.T) {
228303 })
229304 }
230305}
231−
232−func TestEncodeIntoAndDecodeIntoAccessToken(t *testing.T) {
233− const secret = "0123456789abcdefghijklmnopqrstuv"
234− c, err := NewCipher([]byte(secret))
235− assert.Equal(t, nil, err)
236−
237− token := "my access token"
238− originalToken := token
239−
240− assert.Equal(t, nil, c.EncryptInto(&token))
241− assert.NotEqual(t, originalToken, token)
242−
243− assert.Equal(t, nil, c.DecryptInto(&token))
244− assert.Equal(t, originalToken, token)
245−
246− // Check no errors with empty or nil strings
247− empty := ""
248− assert.Equal(t, nil, c.EncryptInto(&empty))
249− assert.Equal(t, nil, c.DecryptInto(&empty))
250− assert.Equal(t, nil, c.EncryptInto(nil))
251− assert.Equal(t, nil, c.DecryptInto(nil))
252−}