-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changed encryption keys from hex encoded UUID to base64 encoded crypt…
…o.Rand using AES-256 32 bytes. Releasing v0.7.3
- Loading branch information
Showing
10 changed files
with
126 additions
and
175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package eventencryptor | ||
|
|
||
| import ( | ||
| "crypto/rand" | ||
| "encoding/base64" | ||
| "io" | ||
|
|
||
| "github.com/inklabs/rangedb" | ||
| "github.com/inklabs/rangedb/pkg/crypto" | ||
| ) | ||
|
|
||
| type eventEncryptor struct { | ||
| engine *engine | ||
| } | ||
|
|
||
| func New(store crypto.KeyStore, encryptor crypto.Encryptor) *eventEncryptor { | ||
| return &eventEncryptor{ | ||
| engine: newEngine(store, encryptor), | ||
| } | ||
| } | ||
|
|
||
| func (e *eventEncryptor) Encrypt(event rangedb.Event) error { | ||
| if event, ok := event.(crypto.SelfEncryptor); ok { | ||
| return event.Encrypt(e.engine) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (e *eventEncryptor) Decrypt(event rangedb.Event) error { | ||
| if event, ok := event.(crypto.SelfEncryptor); ok { | ||
| return event.Decrypt(e.engine) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (e *eventEncryptor) SetRandReader(randReader io.Reader) { | ||
| e.engine.setRandReader(randReader) | ||
| } | ||
|
|
||
| type engine struct { | ||
| keyStore crypto.KeyStore | ||
| encryptor crypto.Encryptor | ||
| randReader io.Reader | ||
| } | ||
|
|
||
| func newEngine(store crypto.KeyStore, encryptor crypto.Encryptor) *engine { | ||
| return &engine{ | ||
| keyStore: store, | ||
| encryptor: encryptor, | ||
| randReader: rand.Reader, | ||
| } | ||
| } | ||
|
|
||
| func (e *engine) Encrypt(subjectID, data string) (string, error) { | ||
| base64Key, err := e.keyStore.Get(subjectID) | ||
| if err == crypto.ErrKeyNotFound { | ||
| base64Key, err = e.newBase64AES256Key() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| err = e.keyStore.Set(subjectID, base64Key) | ||
| } | ||
|
|
||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| return e.encryptor.Encrypt(base64Key, data) | ||
| } | ||
|
|
||
| func (e *engine) Decrypt(subjectID, cipherText string) (string, error) { | ||
| base64Key, err := e.keyStore.Get(subjectID) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| return e.encryptor.Decrypt(base64Key, cipherText) | ||
| } | ||
|
|
||
| func (e *engine) newBase64AES256Key() (string, error) { | ||
| const aes256ByteLength = 32 | ||
| encryptionKey := make([]byte, aes256ByteLength) | ||
| if _, err := io.ReadFull(e.randReader, encryptionKey); err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| return base64.StdEncoding.EncodeToString(encryptionKey), nil | ||
| } | ||
|
|
||
| func (e *engine) setRandReader(randReader io.Reader) { | ||
| e.randReader = randReader | ||
| } |
Oops, something went wrong.