fix(config): check for config media type when pushing to repodb

pkg/cli/search_cmd_referrers_test.go

@@ -46,7 +46,7 @@ func TestReferrersSearchers(t *testing.T) {
 			So(ok, ShouldBeFalse)
 		})
 
-		Convey("GetRepoRefference fails", func() {
+		Convey("GetRepoReference fails", func() {
 			conf := searchConfig{
 				params: map[string]*string{
 					"subject": ref("bad-subject"),
@@ -119,7 +119,7 @@ func TestReferrersSearchers(t *testing.T) {
 			So(ok, ShouldBeFalse)
 		})
 
-		Convey("GetRepoRefference fails", func() {
+		Convey("GetRepoReference fails", func() {
 			conf := searchConfig{
 				params: map[string]*string{
 					"subject": ref("bad-subject"),

pkg/cli/searcher.go

@@ -636,7 +636,7 @@ func (search referrerSearcherGQL) search(config searchConfig) (bool, error) {
 
 	username, password := getUsernameAndPassword(*config.user)
 
-	repo, ref, refIsTag, err := zcommon.GetRepoRefference(*config.params["subject"])
+	repo, ref, refIsTag, err := zcommon.GetRepoReference(*config.params["subject"])
 	if err != nil {
 		return true, err
 	}
@@ -692,7 +692,7 @@ func (search referrerSearcher) search(config searchConfig) (bool, error) {
 
 	username, password := getUsernameAndPassword(*config.user)
 
-	repo, ref, refIsTag, err := zcommon.GetRepoRefference(*config.params["subject"])
+	repo, ref, refIsTag, err := zcommon.GetRepoReference(*config.params["subject"])
 	if err != nil {
 		return true, err
 	}

pkg/common/common.go

@@ -10,6 +10,8 @@ import (
 	"syscall"
 	"time"
 	"unicode/utf8"
+
+	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 const (
@@ -112,3 +114,14 @@ func ContainsString(strSlice []string, str string) bool {
 
 	return false
 }
+
+func UnmashalImageConfig(blob []byte) ispec.Image {
+	var configContent ispec.Image
+
+	err := json.Unmarshal(blob, &configContent)
+	if err != nil {
+		return ispec.Image{}
+	}
+
+	return configContent
+}

pkg/common/oci.go

@@ -84,7 +84,7 @@ func GetImageLastUpdated(imageInfo ispec.Image) time.Time {
 	return *timeStamp
 }
 
-// GetRepoRefference returns the components of a repoName:tag or repoName@digest string. If the format is wrong
+// GetRepoReference returns the components of a repoName:tag or repoName@digest string. If the format is wrong
 // an error is returned.
 // The returned values have the following meaning:
 //
@@ -95,7 +95,7 @@ func GetImageLastUpdated(imageInfo ispec.Image) time.Time {
 // - bool: value for the statement: "the reference is a tag"
 //
 // - error: error value.
-func GetRepoRefference(repo string) (string, string, bool, error) {
+func GetRepoReference(repo string) (string, string, bool, error) {
 	repoName, digest, found := strings.Cut(repo, "@")
 
 	if !found {

pkg/extensions/search/convert/metadb.go

@@ -317,15 +317,7 @@ func ImageManifest2ImageSummary(ctx context.Context, repo, tag string, digest go
 		return &gql_generated.ImageSummary{}, map[string]int64{}, err
 	}
 
-	var configContent ispec.Image
-
-	err = json.Unmarshal(manifestMeta.ConfigBlob, &configContent)
-	if err != nil {
-		graphql.AddError(ctx, gqlerror.Errorf("can't unmarshal config blob for image: %s:%s, manifest digest: %s, error: %s",
-			repo, tag, manifestDigest, err.Error()))
-
-		return &gql_generated.ImageSummary{}, map[string]int64{}, err
-	}
+	configContent := zcommon.UnmashalImageConfig(manifestMeta.ConfigBlob)
 
 	var (
 		repoName         = repo
@@ -485,15 +477,7 @@ func ImageManifest2ManifestSummary(ctx context.Context, repo, tag string, descri
 		return &gql_generated.ManifestSummary{}, map[string]int64{}, err
 	}
 
-	var configContent ispec.Image
-
-	err = json.Unmarshal(manifestMeta.ConfigBlob, &configContent)
-	if err != nil {
-		graphql.AddError(ctx, gqlerror.Errorf("can't unmarshal config blob for image: %s:%s, manifest digest: %s, error: %s",
-			repo, tag, digest, err.Error()))
-
-		return &gql_generated.ManifestSummary{}, map[string]int64{}, err
-	}
+	configContent := zcommon.UnmashalImageConfig(manifestMeta.ConfigBlob)
 
 	var (
 		manifestDigestStr = digest.String()

pkg/extensions/search/cve/cve.go

@@ -311,12 +311,7 @@ func getConfigAndDigest(metaDB mTypes.MetaDB, manifestDigestStr string) (ispec.I
 		return ispec.Image{}, "", err
 	}
 
-	var configContent ispec.Image
-
-	err = json.Unmarshal(manifestData.ConfigBlob, &configContent)
-	if err != nil {
-		return ispec.Image{}, "", err
-	}
+	configContent := zcommon.UnmashalImageConfig(manifestData.ConfigBlob)
 
 	return configContent, manifestDigest, nil
 }

pkg/meta/boltdb/boltdb.go

@@ -296,17 +296,17 @@ func (bdw BoltDB) SetReferrer(repo string, referredDigest godigest.Digest, refer
 			return err
 		}
 
-		refferers := repoMeta.Referrers[referredDigest.String()]
+		referrers := repoMeta.Referrers[referredDigest.String()]
 
-		for i := range refferers {
-			if refferers[i].Digest == referrer.Digest {
+		for i := range referrers {
+			if referrers[i].Digest == referrer.Digest {
 				return nil
 			}
 		}
 
-		refferers = append(refferers, referrer)
+		referrers = append(referrers, referrer)
 
-		repoMeta.Referrers[referredDigest.String()] = refferers
+		repoMeta.Referrers[referredDigest.String()] = referrers
 
 		repoMetaBlob, err = json.Marshal(repoMeta)
 		if err != nil {

pkg/meta/dynamodb/dynamo.go

@@ -327,17 +327,17 @@ func (dwr DynamoDB) SetReferrer(repo string, referredDigest godigest.Digest, ref
 		}
 	}
 
-	refferers := repoMeta.Referrers[referredDigest.String()]
+	referrers := repoMeta.Referrers[referredDigest.String()]
 
-	for i := range refferers {
-		if refferers[i].Digest == referrer.Digest {
+	for i := range referrers {
+		if referrers[i].Digest == referrer.Digest {
 			return nil
 		}
 	}
 
-	refferers = append(refferers, referrer)
+	referrers = append(referrers, referrer)
 
-	repoMeta.Referrers[referredDigest.String()] = refferers
+	repoMeta.Referrers[referredDigest.String()] = referrers
 
 	return dwr.SetRepoMeta(repo, repoMeta)
 }

pkg/meta/storage_parsing.go

@@ -332,9 +332,11 @@ func NewManifestData(repoName string, manifestBlob []byte, imageStore storageTyp
 		return mTypes.ManifestData{}, err
 	}
 
-	err = json.Unmarshal(configBlob, &configContent)
-	if err != nil {
-		return mTypes.ManifestData{}, err
+	if manifestContent.Config.MediaType == ispec.MediaTypeImageConfig {
+		err = json.Unmarshal(configBlob, &configContent)
+		if err != nil {
+			return mTypes.ManifestData{}, err
+		}
 	}
 
 	manifestData.ManifestBlob = manifestBlob
@@ -381,9 +383,9 @@ func SetImageMetaFromInput(repo, reference, mediaType string, digest godigest.Di
 		}
 	}
 
-	refferredDigest, referrerInfo, hasSubject, err := GetReferredInfo(descriptorBlob, digest.String(), mediaType)
+	referredDigest, referrerInfo, hasSubject, err := GetReferredInfo(descriptorBlob, digest.String(), mediaType)
 	if hasSubject && err == nil {
-		err := metaDB.SetReferrer(repo, refferredDigest, referrerInfo)
+		err := metaDB.SetReferrer(repo, referredDigest, referrerInfo)
 		if err != nil {
 			log.Error().Err(err).Msg("metadb: error while settingg referrer")
 

pkg/meta/update.go

@@ -58,15 +58,15 @@ func OnUpdateManifest(repo, reference, mediaType string, digest godigest.Digest,
 			}
 		}
 	} else {
-		err := SetImageMetaFromInput(repo, reference, mediaType, digest, body,
+		err = SetImageMetaFromInput(repo, reference, mediaType, digest, body,
 			imgStore, metaDB, log)
 		if err != nil {
 			metadataSuccessfullySet = false
 		}
 	}
 
 	if !metadataSuccessfullySet {
-		log.Info().Str("tag", reference).Str("repository", repo).Msg("uploding image meta was unsuccessful for tag in repo")
+		log.Info().Str("tag", reference).Str("repository", repo).Msg("uploading image meta was unsuccessful for tag in repo")
 
 		if err := imgStore.DeleteImageManifest(repo, reference, false); err != nil {
 			log.Error().Err(err).Str("reference", reference).Str("repository", repo).
@@ -122,8 +122,8 @@ func OnDeleteManifest(repo, reference, mediaType string, digest godigest.Digest,
 			manageRepoMetaSuccessfully = false
 		}
 
-		if refferredDigest, hasSubject := common.GetReferredSubject(manifestBlob); hasSubject {
-			err := metaDB.DeleteReferrer(repo, refferredDigest, digest)
+		if referredDigest, hasSubject := common.GetReferredSubject(manifestBlob); hasSubject {
+			err := metaDB.DeleteReferrer(repo, referredDigest, digest)
 			if err != nil {
 				log.Error().Err(err).Msg("metadb: error while deleting referrer")