Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Return empty result when no scanner configured (#19577) 

fixes #19534

Signed-off-by: stonezdj <daojunz@vmware.com>
This commit is contained in:
stonezdj(Daojun Zhang) 2023-11-17 15:29:19 +08:00 committed by GitHub
parent 08cb0803a8
commit 307a3121aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/controller/securityhub/controller.go
View File

@ -86,8 +86,8 @@ func NewController() Controller {
func (c *controller) SecuritySummary(ctx context.Context, projectID int64, options ...Option) (*secHubModel.Summary, error) {
opts := newOptions(options...)
scannerUUID, err := c.scannerMgr.DefaultScannerUUID(ctx)
if err != nil {
return nil, err
if len(scannerUUID) == 0 || err != nil {
return &secHubModel.Summary{}, nil
}
sum, err := c.secHubMgr.Summary(ctx, scannerUUID, projectID, nil)
if err != nil {

3
src/pkg/scan/scanner/manager.go
View File

@ -152,5 +152,8 @@ func (bm *basicManager) DefaultScannerUUID(ctx context.Context) (string, error)
if err != nil {
return "", err
}
if reg == nil {
return "", nil
}
return reg.UUID, nil
}

4
src/server/v2.0/handler/security.go
View File

@ -108,8 +108,8 @@ func (s *securityAPI) ListVulnerabilities(ctx context.Context, params securityMo
return s.SendError(ctx, err)
}
scannerUUID, err := scanner.Mgr.DefaultScannerUUID(ctx)
if err != nil {
return s.SendError(ctx, err)
if err != nil || len(scannerUUID) == 0 {
return securityModel.NewListVulnerabilitiesOK().WithPayload([]*models.VulnerabilityItem{}).WithXTotalCount(0)
}
cnt, err := s.controller.CountVuls(ctx, scannerUUID, 0, *params.TuneCount, query)
if err != nil {