Add support to use KMS for signing EIF files when building them #20
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
Closed
eugkoira
commented
Apr 12, 2024
We extend EIF building functionality with additional option of signing EIF files with KMS. sign_info parameter of EifBuilder now turned to a structure that contains enum for the signing key. This enum can be represented as local private key (previous functionality) or KMS signing key (implemented in COSE library). Also a couple of wrappers and helper methods are introduced to store initial information about signing keys and transform it to the keys itself. The information about KMS signing key is represented as unique KMS key id string and optional region string. In case region is missed it will be read from AWS_REGION environment variable as a standard way for SDK configuration. Signed-off-by: Eugene Koira <eugkoira@amazon.com>
Small part of reading and initializing key and certficate data is covered with tests. Signed-off-by: Eugene Koira <eugkoira@amazon.com>
Signed-off-by: Eugene Koira <eugkoira@amazon.com>
Update minimum supported rust version (MSRV) to 1.68.2. Signed-off-by: Eugene Koira <eugkoira@amazon.com>
mariusknaust
approved these changes
Apr 19, 2024
Comment on lines
+27
to
+30
| aws-sdk-kms = "<=1.20" | ||
| aws-config = "<=1.1" | ||
| aws-types = "<=1.1" | ||
| aws-smithy-runtime = { version = "<=1.2" } |
There was a problem hiding this comment.
What is the reason for enforcing a maximal version? Consider adding it as a comment or in the commit message.
| }; | ||
|
|
||
| let sign_key_data = sign_key_info.map(|key_info| { | ||
| SignKeyData::new(&SignKeyDataInfo { | ||
| cert_path: signing_certificate.unwrap().to_string(), |
There was a problem hiding this comment.
nit: unwrap -> sign_key_info.zip(signing_certificate).map(|(key_info, certificate)| ...)
| (None, Some(key_path)) => Some(SignKeyInfo::LocalPrivateKeyInfo { | ||
| path: key_path.to_string(), | ||
| }), | ||
| _ => panic!("kms-key-id and private-key parameters are mutually exclusive"), |
| pub private_key: Vec<u8>, | ||
| pub struct SignKeyDataInfo { | ||
| // Path to the certificate file | ||
| pub cert_path: String, |
There was a problem hiding this comment.
nit: We should consider to use std::path::Path for all the paths
| .await | ||
| .unwrap() | ||
| }; | ||
| let runtime = Runtime::new().unwrap(); |
There was a problem hiding this comment.
nit: consider to map the unwrap to an Err(String) and use ?
| signing_certificate, | ||
| signature, | ||
| signing_certificate: sign_info.cert.clone(), | ||
| signature: cose_sign.unwrap().as_bytes(false).unwrap(), |
There was a problem hiding this comment.
nit: use expect and explain why it is safe to unwrap
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.
Issue #, if available:
aws/aws-nitro-enclaves-cli#204
Description of changes:
This is a reworked version of #6 because it was abandoned
We extend EIF building functionality with additional option of signing EIF files with KMS.
sign_infoparameter of EifBuilder now turned to a structure that contains enum for the signing key.This enum can be represented as local private key (previous functionality)
or KMS signing key (implemented in COSE library).
Also a couple of wrappers and helper methods are introduced
to store initial information about signing keys and transform it to the keys itself.
The information about KMS signing key is represented as unique KMS key id string and optional
region string. In case region is missed it will be read from
AWS_REGIONenvironment variableas a standard way for SDK configuration.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.