Fix jar e2e test by retrieving sig/key from JAR

Signed-off-by: Riccardo Schirone <[email protected]>

Author: ret2libc

go.sum

@@ -529,10 +529,7 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-<<<<<<< HEAD
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-=======
->>>>>>> 4bb3336 (Update sigstore/sigstore with PublicKeyDetails)
 golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

pkg/types/jar/v0.0.1/entry.go

@@ -324,12 +324,30 @@ func (v *V001Entry) CreateFromArtifactProperties(ctx context.Context, props type
 	}
 	re.JARModel.Archive.Content = (strfmt.Base64)(artifactBytes)
 
-	if err := re.validate(); err != nil {
+	keyObj, sigObj, err := re.fetchExternalEntities(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("error retrieving external entities: %v", err)
+	}
+
+	// need to canonicalize key content
+	keyContent, err := keyObj.CanonicalValue()
+	if err != nil {
+		return nil, err
+	}
+	sigContent, err := sigObj.CanonicalValue()
+	if err != nil {
 		return nil, err
 	}
 
-	if _, _, err := re.fetchExternalEntities(ctx); err != nil {
-		return nil, fmt.Errorf("error retrieving external entities: %v", err)
+	re.JARModel.Signature = &models.JarV001SchemaSignature{
+		PublicKey: &models.JarV001SchemaSignaturePublicKey{
+			Content: (*strfmt.Base64)(&keyContent),
+		},
+		Content: sigContent,
+	}
+
+	if err := re.validate(); err != nil {
+		return nil, err
 	}
 
 	returnVal.APIVersion = swag.String(re.APIVersion())