From 7cb5c34f7ebcc8ae0daddf8f50a2caa194ac6ebf Mon Sep 17 00:00:00 2001
From: Wang Yan <wangyan@vmware.com>
Date: Thu, 17 Mar 2022 11:08:39 +0800
Subject: [PATCH] add cosign signature icon (#16533)

Return icon message for UI to render

Signed-off-by: Wang Yan <wangyan@vmware.com>
---
 icons/cosign.png                           | Bin 0 -> 3146 bytes
 src/controller/icon/controller.go          |  45 ++++++++++++++++-----
 src/lib/icon/const.go                      |   2 +-
 src/pkg/accessory/manager.go               |  16 ++++++++
 src/pkg/accessory/manager_test.go          |  10 +++++
 src/pkg/accessory/model/accessory.go       |   1 +
 src/server/v2.0/handler/model/accessory.go |   2 +-
 7 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 icons/cosign.png

diff --git a/icons/cosign.png b/icons/cosign.png
new file mode 100644
index 0000000000000000000000000000000000000000..12bbb9c3413c0da3fed55d7a9d3a8d298d404393
GIT binary patch
literal 3146
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

literal 0
HcmV?d00001

diff --git a/src/controller/icon/controller.go b/src/controller/icon/controller.go
index 872d298ed..8baae5595 100644
--- a/src/controller/icon/controller.go
+++ b/src/controller/icon/controller.go
@@ -37,16 +37,37 @@ import (
 )
 
 var (
-	builtInIcons = map[string]string{
-		icon.DigestOfIconImage:   "./icons/image.png",
-		icon.DigestOfIconChart:   "./icons/chart.png",
-		icon.DigestOfIconCNAB:    "./icons/cnab.png",
-		icon.DigestOfIconDefault: "./icons/default.png",
+	builtInIcons = map[string]buildInIcon{
+		icon.DigestOfIconImage: {
+			path:   "./icons/image.png",
+			resize: true,
+		},
+		icon.DigestOfIconChart: {
+			path:   "./icons/chart.png",
+			resize: true,
+		},
+		icon.DigestOfIconCNAB: {
+			path:   "./icons/cnab.png",
+			resize: true,
+		},
+		icon.DigestOfIconAccCosign: {
+			path:   "./icons/cosign.png",
+			resize: false,
+		},
+		icon.DigestOfIconDefault: {
+			path:   "./icons/default.png",
+			resize: true,
+		},
 	}
 	// Ctl is a global icon controller instance
 	Ctl = NewController()
 )
 
+type buildInIcon struct {
+	path   string
+	resize bool
+}
+
 // Icon model for artifact icon
 type Icon struct {
 	ContentType string
@@ -84,9 +105,9 @@ func (c *controller) Get(ctx context.Context, digest string) (*Icon, error) {
 		iconFile io.ReadCloser
 		err      error
 	)
-	// for the fixed icons: image, helm chart, CNAB and unknown
-	if path, exist := builtInIcons[digest]; exist {
-		iconFile, err = os.Open(path)
+
+	if i, exist := builtInIcons[digest]; exist {
+		iconFile, err = os.Open(i.path)
 		if err != nil {
 			return nil, err
 		}
@@ -118,7 +139,13 @@ func (c *controller) Get(ctx context.Context, digest string) (*Icon, error) {
 	}
 
 	// resize the icon to 50x50
-	img = resize.Thumbnail(50, 50, img, resize.NearestNeighbor)
+	if i, exist := builtInIcons[digest]; exist {
+		if i.resize {
+			img = resize.Thumbnail(50, 50, img, resize.NearestNeighbor)
+		}
+	} else {
+		img = resize.Thumbnail(50, 50, img, resize.NearestNeighbor)
+	}
 
 	// encode the resized icon to png
 	buf := &bytes.Buffer{}
diff --git a/src/lib/icon/const.go b/src/lib/icon/const.go
index da7330628..0c24b632a 100644
--- a/src/lib/icon/const.go
+++ b/src/lib/icon/const.go
@@ -9,5 +9,5 @@ const (
 
 	// ToDo add the accessories images
 	DigestOfIconAccDefault = ""
-	DigestOfIconAccCosign  = ""
+	DigestOfIconAccCosign  = "sha256:20401d5b3a0f6dbc607c8d732eb08471af4ae6b19811a4efce8c6a724aed2882"
 )
diff --git a/src/pkg/accessory/manager.go b/src/pkg/accessory/manager.go
index 44abe1db9..e0404ac09 100644
--- a/src/pkg/accessory/manager.go
+++ b/src/pkg/accessory/manager.go
@@ -17,6 +17,7 @@ package accessory
 import (
 	"context"
 	"github.com/goharbor/harbor/src/lib/errors"
+	"github.com/goharbor/harbor/src/lib/icon"
 	"github.com/goharbor/harbor/src/lib/q"
 	"github.com/goharbor/harbor/src/pkg/accessory/dao"
 	"github.com/goharbor/harbor/src/pkg/accessory/model"
@@ -28,6 +29,11 @@ import (
 var (
 	// Mgr is a global artifact manager instance
 	Mgr = NewManager()
+
+	// icon digests for each known type
+	defaultIcons = map[string]string{
+		model.TypeCosignSignature: icon.DigestOfIconAccCosign,
+	}
 )
 
 // Manager is the only interface of artifact module to provide the management functions for artifacts
@@ -93,6 +99,7 @@ func (m *manager) Get(ctx context.Context, id int64) (model.Accessory, error) {
 		Size:          acc.Size,
 		Digest:        acc.Digest,
 		CreatTime:     acc.CreationTime,
+		Icon:          m.GetIcon(acc.Type),
 	})
 }
 
@@ -114,6 +121,7 @@ func (m *manager) List(ctx context.Context, query *q.Query) ([]model.Accessory,
 			Size:          accD.Size,
 			Digest:        accD.Digest,
 			CreatTime:     accD.CreationTime,
+			Icon:          m.GetIcon(accD.Type),
 		})
 		if err != nil {
 			return nil, errors.New(err).WithCode(errors.BadRequestCode)
@@ -142,3 +150,11 @@ func (m *manager) DeleteAccessories(ctx context.Context, q *q.Query) error {
 	_, err := m.dao.DeleteAccessories(ctx, q)
 	return err
 }
+
+func (m *manager) GetIcon(accType string) string {
+	accIcon := ""
+	if i, ok := defaultIcons[accType]; ok {
+		accIcon = i
+	}
+	return accIcon
+}
diff --git a/src/pkg/accessory/manager_test.go b/src/pkg/accessory/manager_test.go
index 1376a7146..d3f9c03bf 100644
--- a/src/pkg/accessory/manager_test.go
+++ b/src/pkg/accessory/manager_test.go
@@ -104,6 +104,16 @@ func (m *managerTestSuite) TestDeleteOfArtifact() {
 	m.dao.AssertExpectations(m.T())
 }
 
+func (m *managerTestSuite) TestGetIcon() {
+	var icon string
+	icon = m.mgr.GetIcon("")
+	m.Require().Empty(icon, "empty icon")
+	icon = m.mgr.GetIcon("signature.cosign")
+	m.Require().Equal("sha256:20401d5b3a0f6dbc607c8d732eb08471af4ae6b19811a4efce8c6a724aed2882", icon)
+	icon = m.mgr.GetIcon("unknown")
+	m.Require().Empty(icon, "empty icon")
+}
+
 func TestManager(t *testing.T) {
 	suite.Run(t, &managerTestSuite{})
 }
diff --git a/src/pkg/accessory/model/accessory.go b/src/pkg/accessory/model/accessory.go
index e21bb5b80..033d93157 100644
--- a/src/pkg/accessory/model/accessory.go
+++ b/src/pkg/accessory/model/accessory.go
@@ -74,6 +74,7 @@ type AccessoryData struct {
 	Size          int64     `json:"size"`
 	Digest        string    `json:"digest"`
 	CreatTime     time.Time `json:"creation_time"`
+	Icon          string    `json:"icon"`
 }
 
 // Accessory Independent, but linked to an existing subject artifact, which enabling the extensibility of an OCI artifact
diff --git a/src/server/v2.0/handler/model/accessory.go b/src/server/v2.0/handler/model/accessory.go
index 24e623709..45d88c12e 100644
--- a/src/server/v2.0/handler/model/accessory.go
+++ b/src/server/v2.0/handler/model/accessory.go
@@ -20,7 +20,7 @@ func (a *Accessory) ToSwagger() *models.Accessory {
 		Size:              a.Size,
 		Digest:            a.Digest,
 		Type:              a.Type,
-		Icon:              "",
+		Icon:              a.Icon,
 		CreationTime:      strfmt.DateTime(a.CreatTime),
 	}
 }