[launcher] Merge upstream/tdx_rtmr #513
Merged
+585
−356
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
Squashed commit of the following: commit 896c633 Author: Jessie Liu <jessieqliu@google.com> Date: Wed Oct 30 18:31:27 2024 +0000 Revert "implement AttestationEvidence for TDX" This reverts commit d150246. commit d150246 Author: Jessie Liu <jessieqliu@google.com> Date: Wed Oct 30 18:26:48 2024 +0000 implement AttestationEvidence for TDX commit c38b622 Author: Jiankun Lü <jiankun@google.com> Date: Thu Oct 10 18:37:30 2024 -0700 [launcher] Add TDX/RTMR attestation in launcher (google#478) Allow a TDX machine to create a TD quote and request a hardware rooted attestation from the attestation verifier. ./launcher ci will now only run in linux. Upgrade go-sev-guest. Signed-off-by: Jiankun Lu <jiankun@google.com>
|
/gcbrun |
|
/gcbrun |
|
/gcbrun |
|
/gcbrun |
|
/gcbrun |
alexmwu
reviewed
Dec 10, 2024
launcher/agent/agent.go
Outdated
Comment on lines
108
to
110
| qp, err := tg.GetQuoteProvider() | ||
| if err != nil || qp.IsSupported() != nil { | ||
| if err != nil { // for now GetQuoteProvider always return a nil err, still adding just for safety |
There was a problem hiding this comment.
Why is this not two if statements?
There was a problem hiding this comment.
why is the error an Info?
qp, err := tg.GetQuoteProvider()
if err != nil {
logger.Error("...")
return nil, fmt.Errorf("...")
}
There was a problem hiding this comment.
I use this condition to determine if it is running on a TDX machine or not.
So qp.IsSupported() will return error on a AMD machine, which is okay, we just need to switch to TPM attestation. So I don't think this warrants an error
| } | ||
|
|
||
| // check if this is running on a TDX machine | ||
| qp, err := tg.GetQuoteProvider() |
There was a problem hiding this comment.
Aren't there better checks? Like if /dev/tdx-guest is available?
There was a problem hiding this comment.
I want to avoid checking the device file directly, I think calling this is a easier route for us
launcher/agent/agent.go
Outdated
Comment on lines
113
to
114
| logger.Info(fmt.Sprintf("Cannot create the TDX quote provider (this is expected on a non-TDX machine): %v", qp.IsSupported().Error())) | ||
| } |
There was a problem hiding this comment.
if err := qp.IsSupported(); err != nil {
logger.Info("Using TPM PCRs for measurement")
// by default using TPM
attestAgent.ar = &tpmAttestRoot{
fetchedAK: ak,
tpm: tpm,
}
}
There was a problem hiding this comment.
modifying to
qp, _ := tg.GetQuoteProvider()
if err := qp.IsSupported(); err != nil {
logger.Info(fmt.Sprintf("Cannot create the TDX quote provider (this is expected on a non-TDX machine): %v", err))
logger.Info("Using TPM PCRs for measurement")
// if cannot get a TDX Quote Provider, by default using TPM as attest root
attestAgent.ar = &tpmAttestRoot{
fetchedAK: ak,
tpm: tpm,
}
jkl73
force-pushed
the
mergetdx
branch
3 times, most recently
from
fc4ce78 to
5cc38ff
Compare
|
/gcbrun |
alexmwu
approved these changes
Dec 11, 2024
Add some logging on support both TDX and SEV attestation. Update cloudbuild file to make substitution variables cleaner. Signed-off-by: Jiankun Lu <jiankun@google.com>
|
/gcbrun |
jkl73
added a commit
to jkl73/go-tpm-tools
that referenced
this pull request
Dec 17, 2024
This reverts commit 86a7e85. Signed-off-by: Jiankun Lu <jiankun@google.com>
jkl73
added a commit
to jkl73/go-tpm-tools
that referenced
this pull request
Dec 17, 2024
This reverts commit 86a7e85. Signed-off-by: Jiankun Lu <jiankun@google.com>
jkl73
added a commit
to jkl73/go-tpm-tools
that referenced
this pull request
Dec 17, 2024
This reverts commit 86a7e85. Signed-off-by: Jiankun Lu <jiankun@google.com>
jkl73
added a commit
to jkl73/go-tpm-tools
that referenced
this pull request
Dec 17, 2024
This reverts commit 86a7e85. Signed-off-by: Jiankun Lu <jiankun@google.com>
jkl73
added a commit
that referenced
this pull request
Dec 17, 2024
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.
Merge upstream/tdx_rtmr changes into main.
Squashed commit of the following:
Second commit:
Add some logging to make TDX/SEV attest cleaner.
Update cloudbuild files to make the substitution variables cleaner