In toto attestation refactor #2734
+86
−67
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -17,21 +17,18 @@ package slsa | |
|
|
||
| import ( | ||
| "context" | ||
| slsa01 "github.com/in-toto/attestation/go/predicates/provenance/v01" | ||
| "reflect" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/google/go-cmp/cmp" | ||
| "github.com/guacsec/guac/internal/testing/testdata" | ||
| "github.com/guacsec/guac/pkg/assembler" | ||
| model "github.com/guacsec/guac/pkg/assembler/clients/generated" | ||
| "github.com/guacsec/guac/pkg/handler/processor" | ||
| "github.com/guacsec/guac/pkg/logging" | ||
| "google.golang.org/protobuf/types/known/timestamppb" | ||
| ) | ||
|
|
||
| func Test_slsaParser(t *testing.T) { | ||
|
|
@@ -85,9 +82,11 @@ func Test_slsaParser(t *testing.T) { | |
| func Test_fillSLSA01(t *testing.T) { | ||
| startTime := time.Now() | ||
| endTime := time.Now() | ||
| startTimePB := timestamppb.New(startTime) | ||
| endTimePB := timestamppb.New(endTime) | ||
| type args struct { | ||
| inp *model.SLSAInputSpec | ||
| stmt *slsa01.Provenance | ||
| } | ||
| tests := []struct { | ||
| name string | ||
|
|
@@ -98,15 +97,13 @@ func Test_fillSLSA01(t *testing.T) { | |
| name: "default", | ||
| args: args{ | ||
| inp: &model.SLSAInputSpec{}, | ||
| stmt: &slsa01.Provenance{ | ||
| Metadata: &slsa01.Metadata{ | ||
| BuildStartedOn: startTimePB, | ||
| BuildFinishedOn: endTimePB, | ||
| }, | ||
| Recipe: &slsa01.Recipe{ | ||
| Type: "test", | ||
| }, | ||
| }, | ||
| }, | ||
|
|
@@ -115,14 +112,14 @@ func Test_fillSLSA01(t *testing.T) { | |
| name: "stmt predicate metadata is nil", | ||
| args: args{ | ||
| inp: &model.SLSAInputSpec{}, | ||
| stmt: &slsa01.Provenance{}, | ||
| }, | ||
| err: ErrMetadataNil, | ||
| }, | ||
| } | ||
| for _, test := range tests { | ||
| t.Run(test.name, func(t *testing.T) { | ||
| err := fillSLSA01(test.args.inp, test.args.stmt) | ||
| if err != test.err { | ||
| t.Fatalf("fillSLSA01() error = %v, expected error %v", err, test.err) | ||
| } | ||
|
|
@@ -133,14 +130,20 @@ func Test_fillSLSA01(t *testing.T) { | |
| return | ||
| } | ||
|
|
||
| if test.args.inp.BuildType != test.args.stmt.Recipe.Type { | ||
| t.Errorf("fillSLSA01() inp.BuildType not equal to stmt.Recipe.Type") | ||
| } | ||
| if test.args.stmt.Metadata != nil && test.args.stmt.Metadata.BuildStartedOn != nil { | ||
| expectedStartTime := time.Unix(test.args.stmt.Metadata.BuildStartedOn.GetSeconds(), int64(test.args.stmt.Metadata.BuildStartedOn.GetNanos())) | ||
| if test.args.inp.StartedOn != nil && !test.args.inp.StartedOn.Equal(expectedStartTime) { | ||
| t.Errorf("fillSLSA01() inp.StartedOn not equal to expected time") | ||
| } | ||
| } | ||
| if test.args.stmt.Metadata != nil && test.args.stmt.Metadata.BuildFinishedOn != nil { | ||
| expectedFinishTime := time.Unix(test.args.stmt.Metadata.BuildFinishedOn.GetSeconds(), int64(test.args.stmt.Metadata.BuildFinishedOn.GetNanos())) | ||
| if test.args.inp.FinishedOn != nil && !test.args.inp.FinishedOn.Equal(expectedFinishTime) { | ||
| t.Errorf("fillSLSA01() inp.FinishedOn not equal to expected time") | ||
| } | ||
|
There was a problem hiding this comment. This needs to restore the nesting based on the comment above. It should also check for the subject field |
||
| } | ||
| }) | ||
| } | ||
|
|
@@ -155,14 +158,14 @@ func Test_getSlsaEntity(t *testing.T) { | |
| testname string | ||
| uri string | ||
| name string | ||
| digest map[string]string | ||
| expected *slsaEntity | ||
| wantErr bool | ||
| }{ | ||
| { | ||
| testname: "with uri and digest", | ||
| uri: "pkg:npm/sigstore/[email protected]", | ||
| digest: map[string]string{ | ||
| "sha1": "428601801d1f5d105351a403f58c38269de93f680", | ||
| }, | ||
| expected: &slsaEntity{ | ||
|
|
@@ -188,7 +191,7 @@ func Test_getSlsaEntity(t *testing.T) { | |
| { | ||
| testname: "with name and digest", | ||
| name: "sigstore", | ||
| digest: map[string]string{ | ||
| "sha1": "428601801d1f5d105351a403f58c38269de93f680", | ||
| }, | ||
| expected: &slsaEntity{ | ||
|
|
@@ -213,7 +216,7 @@ func Test_getSlsaEntity(t *testing.T) { | |
| }, | ||
| { | ||
| testname: "without name and uri", | ||
| digest: map[string]string{ | ||
| "sha1": "428601801d1f5d105351a403f58c38269de93f680", | ||
| }, | ||
| wantErr: true, | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is sticking the provenance predicate at the statement layer. Instead, this should be using
in-toto/attestation/go/v1/statementand addingslsa01.Provenanceas the predicate