Integrate nonce verification as part of the TDX quote validation procedure. #395
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
alexmwu
reviewed
Dec 13, 2023
server/verify_tdx.go
Outdated
| Verification *tv.Options | ||
| } | ||
|
|
||
| // TdxDefaultOptions returns a default verification options for TDX | ||
| // TdxDefaultValidateOpts returns a default validation policy for TDX attestation quote on GCE. | ||
| func TdxDefaultValidateOpts(tpmNonce []byte) *validate.Options { |
There was a problem hiding this comment.
nit: it appears this is not always the same as the tpmNonce. We should just name this teeNonce or tdxNonce to be clear this is used in validating the TDX quote contents
There was a problem hiding this comment.
Missed changing name in this function. Now I have renamed here as well.
alexmwu
reviewed
Dec 27, 2023
cmd/verify_test.go
Outdated
| @@ -143,3 +149,82 @@ func TestHwAttestationPass(t *testing.T) { | |||
| }) | |||
| } | |||
| } | |||
|
|
|||
| func TestTdxAttestation(t *testing.T) { | |||
| file1, err := os.Create("attest") | |||
There was a problem hiding this comment.
Tests should use https://pkg.go.dev/testing#T.TempDirtemp then create files in that temp directory.
There was a problem hiding this comment.
Should have a more descriptive name like attestFile
There was a problem hiding this comment.
Thanks for this info. Created a temp dir and renamed it to attestFile
cmd/verify_test.go
Outdated
Comment on lines
220
to
229
| var out []byte | ||
| if format == "binarypb" { | ||
| out, err = proto.Marshal(attestation) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to marshal attestation proto: %v", attestation) | ||
| } | ||
| } else { | ||
| out = []byte(marshalOptions.Format(attestation)) | ||
| } | ||
| return out, nil |
There was a problem hiding this comment.
This function would make more sense returning an Attestation proto message rather than the marshaled proto. This should be test-specific logic, and AFAICT we don't use the format flag right now.
There was a problem hiding this comment.
Makes sense, I have changed function output to attestation proto message. I have added format flag as textproto in verify args so that marshalling logic is test specific.
server/verify_tdx.go
Outdated
| Verification *tv.Options | ||
| } | ||
|
|
||
| // TdxDefaultOptions returns a default verification options for TDX | ||
| // TdxDefaultValidateOpts returns a default validation policy for TDX attestation quote on GCE. | ||
| func TdxDefaultValidateOpts(tpmNonce []byte) *validate.Options { |
alexmwu
reviewed
Dec 28, 2023
internal/test/test_tpm.go
Outdated
| "io" | ||
| "sync" | ||
| "testing" | ||
|
|
||
| "github.com/google/go-attestation/attest" | ||
| "github.com/google/go-tpm-tools/simulator" | ||
| "github.com/google/go-tpm/legacy/tpm2" | ||
| gotpm "github.com/google/go-tpm/tpm2" |
There was a problem hiding this comment.
Why did you rename the import here? Generally avoid this: https://google.github.io/styleguide/go/decisions#import-renaming
There was a problem hiding this comment.
Since tpm2 is imported from 2 different packages, so I have added alias to one of tpm2 import. I have renamed the alias to gtpm2 to avoid any confusion.
alexmwu
approved these changes
Dec 28, 2023
alexmwu
added a commit
to alexmwu/go-tpm-tools
that referenced
this pull request
Feb 22, 2024
New Features: [launcher] Add TEE server IPC implementation google#367 [launcher] Enable memory monitoring in CS google#391 Use TDX quote provider to attest and verify google#405 Integrate nonce verification as part of the TDX quote validation procedure. google#395 Add RISC V support google#407 [launcher] Use resizable integrity-fs with in-memory tags google#412 Bug Fixes: [launcher] Fix launcher exit code google#384 [launcher] Handle exit code checking during deferral evaluation google#392 [cmd] Skip tests that call setGCEAKTemplate google#402 [launcher] Fix teeserver context reset issue & add container signature cache google#397 Set all unused parameters as _ to fix CI lint failure google#411 [launcher] Make customtoken test sleep to mitigate clock skew google#413 Other Changes: Add eventlog parse logics for memory monitoring google#404 [launcher]: Add memory monitor measurement logics google#408 Update go-tdx-guest version to v0.3.1 google#414 New Contributors: @KeithMoyer in google#392 @vbalain in google#405 @aimixsaka in google#407
Merged
alexmwu
added a commit
that referenced
this pull request
Feb 22, 2024
New Features: [launcher] Add TEE server IPC implementation #367 [launcher] Enable memory monitoring in CS #391 Use TDX quote provider to attest and verify #405 Integrate nonce verification as part of the TDX quote validation procedure. #395 Add RISC V support #407 [launcher] Use resizable integrity-fs with in-memory tags #412 Bug Fixes: [launcher] Fix launcher exit code #384 [launcher] Handle exit code checking during deferral evaluation #392 [cmd] Skip tests that call setGCEAKTemplate #402 [launcher] Fix teeserver context reset issue & add container signature cache #397 Set all unused parameters as _ to fix CI lint failure #411 [launcher] Make customtoken test sleep to mitigate clock skew #413 Other Changes: Add eventlog parse logics for memory monitoring #404 [launcher]: Add memory monitor measurement logics #408 Update go-tdx-guest version to v0.3.1 #414 New Contributors: @KeithMoyer in #392 @vbalain in #405 @aimixsaka in #407
alexmwu
added a commit
to alexmwu/go-tpm-tools
that referenced
this pull request
Mar 29, 2024
New Features: [launcher] Add TEE server IPC implementation google#367 [launcher] Enable memory monitoring in CS google#391 Use TDX quote provider to attest and verify google#405 Integrate nonce verification as part of the TDX quote validation procedure. google#395 Add RISC V support google#407 [launcher] Use resizable integrity-fs with in-memory tags google#412 Bug Fixes: [launcher] Fix launcher exit code google#384 [launcher] Handle exit code checking during deferral evaluation google#392 [cmd] Skip tests that call setGCEAKTemplate google#402 [launcher] Fix teeserver context reset issue & add container signature cache google#397 Set all unused parameters as _ to fix CI lint failure google#411 [launcher] Make customtoken test sleep to mitigate clock skew google#413 Other Changes: Add eventlog parse logics for memory monitoring google#404 [launcher]: Add memory monitor measurement logics google#408 Update go-tdx-guest version to v0.3.1 google#414 New Contributors: @KeithMoyer in google#392 @vbalain in google#405 @aimixsaka in google#407
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.
With the integration of the validate package, the go-tdx-guest library now supports TDX quote validation using nonce. I have implemented nonce verification in the TDX quote verification function and added corresponding testcases.