From 8fe8ee9f3f3dd8067f42f879a608f9d1bed01a18 Mon Sep 17 00:00:00 2001
From: asraa <asraa@google.com>
Date: Thu, 1 Jun 2023 15:15:22 -0500
Subject: [PATCH] fix: revert to using resolvedDepdendencies for source
 verification (#629)

Signed-off-by: Asra Ali <asraa@google.com>
---
 verifiers/internal/gha/provenance_test.go     |  6 ++---
 .../gha/slsaprovenance/v1.0/provenance.go     | 25 ++++++-------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/verifiers/internal/gha/provenance_test.go b/verifiers/internal/gha/provenance_test.go
index 6273ca1..aabde41 100644
--- a/verifiers/internal/gha/provenance_test.go
+++ b/verifiers/internal/gha/provenance_test.go
@@ -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,
 							},
 						},
@@ -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) {
diff --git a/verifiers/internal/gha/slsaprovenance/v1.0/provenance.go b/verifiers/internal/gha/slsaprovenance/v1.0/provenance.go
index a602215..be6fbd3 100644
--- a/verifiers/internal/gha/slsaprovenance/v1.0/provenance.go
+++ b/verifiers/internal/gha/slsaprovenance/v1.0/provenance.go
@@ -1,7 +1,6 @@
 package v1
 
 import (
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -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")
+	// Use resolvedDependencies.
+	if len(prov.Predicate.BuildDefinition.ResolvedDependencies) == 0 {
+		return "", fmt.Errorf("%w: empty resovedDependencies", serrors.ErrorInvalidDssePayload)
 	}
-	source, ok := extParams["source"]
-	if !ok {
-		return "", fmt.Errorf("%w: %s", serrors.ErrorInvalidDssePayload, "external parameters source not found")
+	// 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)
 	}
-	sourceBytes, err := json.Marshal(source)
-	if err != nil {
-		return "", fmt.Errorf("%w: %s", err, "marshalling external parameters source")
-	}
-	var sourceResource slsa1.ResourceDescriptor
-	if err := json.Unmarshal(sourceBytes, &sourceResource); err != nil {
-		return "", fmt.Errorf("%w: %s", serrors.ErrorInvalidDssePayload, "external parameters source type")
-	}
-	return sourceResource.URI, nil
+	return uri, nil
 }
 
 // TODO(#613): Support for generators.