Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: revert to using resolvedDepdendencies for source verification #629

Merged
merged 1 commit into from
Jun 1, 2023
Merged

fix: revert to using resolvedDepdendencies for source verification #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions verifiers/internal/gha/provenance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ func Test_verifySourceURI(t *testing.T) {
// "path": "some/path",
// },
// },
ExternalParameters: map[string]interface{}{
"source": slsa1.ResourceDescriptor{
ResolvedDependencies: []slsa1.ResourceDescriptor{
{
URI: tt.provMaterialsURI,
},
},
Expand All @@ -372,7 +372,7 @@ func Test_verifySourceURI(t *testing.T) {
}

if tt.provMaterialsURI == "" {
prov1.Predicate.BuildDefinition.ExternalParameters = nil
prov1.Predicate.BuildDefinition.ResolvedDependencies = nil
}
err = verifySourceURI(prov1, tt.expectedSourceURI, tt.allowNoMaterialRef)
if !errCmp(err, tt.err) {
Expand Down
25 changes: 8 additions & 17 deletions verifiers/internal/gha/slsaprovenance/v1.0/provenance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package v1

import (
"encoding/json"
"fmt"
"strings"
"time"
Expand Down Expand Up @@ -39,24 +38,16 @@ func (prov *ProvenanceV1) BuilderID() (string, error) {
}

func (prov *ProvenanceV1) SourceURI() (string, error) {
// Use externalParameters.
extParams, ok := prov.Predicate.BuildDefinition.ExternalParameters.(map[string]interface{})
if !ok {
return "", fmt.Errorf("%w: %s", serrors.ErrorInvalidDssePayload, "external parameters type")
}
source, ok := extParams["source"]
if !ok {
return "", fmt.Errorf("%w: %s", serrors.ErrorInvalidDssePayload, "external parameters source not found")
}
sourceBytes, err := json.Marshal(source)
if err != nil {
return "", fmt.Errorf("%w: %s", err, "marshalling external parameters source")
// Use resolvedDependencies.
if len(prov.Predicate.BuildDefinition.ResolvedDependencies) == 0 {
return "", fmt.Errorf("%w: empty resovedDependencies", serrors.ErrorInvalidDssePayload)
}
var sourceResource slsa1.ResourceDescriptor
if err := json.Unmarshal(sourceBytes, &sourceResource); err != nil {
return "", fmt.Errorf("%w: %s", serrors.ErrorInvalidDssePayload, "external parameters source type")
// For now, we use the first resolvedDependency relying on a GHA builder-verifier contract.
uri := prov.Predicate.BuildDefinition.ResolvedDependencies[0].URI
if uri == "" {
return "", fmt.Errorf("%w: empty uri", serrors.ErrorMalformedURI)
}
return sourceResource.URI, nil
return uri, nil
}

// TODO(#613): Support for generators.
Expand Down