Skip to content

fix: update CVE's severity and store multiple same CVE's in multiple packages #5168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/sql/repository/security/CveStoreRepository.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type CveStore struct {
tableName struct{} `sql:"cve_store" pg:",discard_unknown_columns"`
Name string `sql:"name,pk"`
Severity Severity `sql:"severity,notnull"`
Package string `sql:"package,notnull"`
Package string `sql:"package,notnull"` // deprecated
Version string `sql:"version,notnull"`
FixedVersion string `sql:"fixed_version,notnull"`
sql.AuditLog
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ type ImageScanExecutionResult struct {
CveStoreName string `sql:"cve_store_name,notnull"`
ImageScanExecutionHistoryId int `sql:"image_scan_execution_history_id"`
ScanToolId int `sql:"scan_tool_id"`
Package string `sql:"package"`
CveStore CveStore
ImageScanExecutionHistory ImageScanExecutionHistory
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/security/ImageScanService.go
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,10 @@ func (impl ImageScanServiceImpl) FetchExecutionDetailResult(request *ImageScanRe
Severity: item.CveStore.Severity.String(),
//Permission: "BLOCK", TODO
}
if len(item.Package) > 0 {
// data already migrated hence get package from image_scan_execution_result
vulnerability.Package = item.Package
}
if item.CveStore.Severity == security.Critical {
highCount = highCount + 1
} else if item.CveStore.Severity == security.Medium {
Expand Down
9 changes: 9 additions & 0 deletions pkg/security/policyService.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,10 @@ func (impl *PolicyServiceImpl) VerifyImage(verifyImageRequest *VerifyImageReques
impl.logger.Errorw("error in fetching vulnerability ", "err", err)
return nil, err
}
cveNameToScanResultPackageNameMapping := make(map[string]string)
var cveStores []*security.CveStore
for _, scanResult := range scanResults {
cveNameToScanResultPackageNameMapping[scanResult.CveStoreName] = scanResult.Package
cveStores = append(cveStores, &scanResult.CveStore)
if _, ok := scanResultsIdMap[scanResult.ImageScanExecutionHistoryId]; !ok {
scanResultsIdMap[scanResult.ImageScanExecutionHistoryId] = scanResult.ImageScanExecutionHistoryId
Expand All @@ -259,6 +261,13 @@ func (impl *PolicyServiceImpl) VerifyImage(verifyImageRequest *VerifyImageReques
Version: cve.Version,
FixedVersion: cve.FixedVersion,
}
if packageName, ok := cveNameToScanResultPackageNameMapping[cve.Name]; ok {
if len(packageName) > 0 {
// fetch package name from image_scan_execution_result table
vr.Package = packageName
}

}
imageBlockedCves[image] = append(imageBlockedCves[image], vr)
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE "image_scan_execution_result" DROP COLUMN "package";
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE "image_scan_execution_result" ADD COLUMN "package" text;
Loading