def: support secret encryption + decryption #155
Merged
Conversation
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
pgavlin
requested review from
cleverguy25,
lblackstone,
komalali,
lukehoban and
EvanBoyle
pgavlin
force-pushed
the
pgavlin/ciphertext
branch
3 times, most recently
from
f0f044f to
2aeb566
Compare
pgavlin
force-pushed
the
pgavlin/ciphertext
branch
from
2aeb566 to
0239480
Compare
|
This is ready for review. PTAL. |
lblackstone
reviewed
Nov 2, 2023
eval/crypt.go
Outdated
| // decryptSecret decrypts a single ciphertext string into its plaintext value. | ||
| func decryptSecret(ctx context.Context, decrypter Decrypter, base64Ciphertext string) (string, error) { | ||
| // Decode and decrypt the ciphertext. | ||
| ciphertext, err := base64.StdEncoding.DecodeString(base64Ciphertext) |
There was a problem hiding this comment.
Does the encrypter also handle b64 encoding?
| ` | ||
|
|
||
| _, err := EncryptSecrets(context.Background(), "doc", []byte(doc), broken{}) | ||
| assert.NoError(t, err) |
There was a problem hiding this comment.
Why is this NoError rather than Error? Same for the matching decrypt test.
There was a problem hiding this comment.
Ah--malformed secrets are ignored by the encrypt/decrypt paths. Error reporting will happen if/when the environment is parsed.
There was a problem hiding this comment.
I'll add a comment to that effect
lblackstone
approved these changes
Nov 2, 2023
cleverguy25
approved these changes
Nov 2, 2023
pgavlin
force-pushed
the
pgavlin/ciphertext
branch
3 times, most recently
from
7f83b69 to
c9ca96e
Compare
These changes add support for encrypting and decrypting static secrets in environment definitions. Encryprtion and decryption is handled as a pre-evaluation pass. The parser expects secrets to be decrypted prior to parsing, and will issue errors if it detects encrypted secrets. Encrypted secrets are represented in the document by calls to `fn::secret` of the form ```yaml fn::secret: ciphertext: <base64-encoded value> ``` In order to support this representation, `fn::secret` now requires that its argument is a boolean, number, or string literal.
pgavlin
force-pushed
the
pgavlin/ciphertext
branch
from
c9ca96e to
2fa5852
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These changes add support for encrypting and decrypting static secrets in environment definitions. Encryprtion and decryption is handled as a pre-evaluation pass. The parser expects secrets to be decrypted prior to parsing, and will issue errors if it detects encrypted secrets.
Encrypted secrets are represented in the document by calls to
fn::secretof the formIn order to support this representation,
fn::secretnow requires that its argument is a string literal.