github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-17 21:17:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: fix some coverage issues, refactored some of the pagination logic to accomplish this (#3674)

Browse Source 
Signed-off-by: Andrei Aaron <andreifdaaron@gmail.com>
This commit is contained in:
Andrei Aaron
2025-12-23 19:06:13 +02:00
committed by GitHub
parent 4ad3fad3bc
commit 95b8d65c8a
6 changed files with 154 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/extensions/search/cve/cve.go
+18 -18
View File
@@ -339,21 +339,29 @@ func getConfigAndDigest(metaDB mTypes.MetaDB, manifestDigestStr string) (ispec.I
return manifestData.Manifests[0].Config, manifestDigest, err
}
func shouldIncludeCVE(cve cvemodel.CVE, searchedCVE, excludedCVE, severity string) bool {
if severity != "" && (cvemodel.CompareSeverities(cve.Severity, severity) != 0) {
return false
}
if excludedCVE != "" && cve.ContainsStr(excludedCVE) {
return false
}
if !cve.ContainsStr(searchedCVE) {
return false
}
return true
}
func filterCVEMap(cveMap map[string]cvemodel.CVE, searchedCVE, excludedCVE, severity string,
pageFinder *CvePageFinder,
) {
searchedCVE = strings.ToUpper(searchedCVE)
for _, cve := range cveMap {
if severity != "" && (cvemodel.CompareSeverities(cve.Severity, severity) != 0) {
continue
}
if excludedCVE != "" && cve.ContainsStr(excludedCVE) {
continue
}
if cve.ContainsStr(searchedCVE) {
if shouldIncludeCVE(cve, searchedCVE, excludedCVE, severity) {
pageFinder.Add(cve)
}
}
@@ -363,15 +371,7 @@ func filterCVEList(cveList []cvemodel.CVE, searchedCVE, excludedCVE, severity st
searchedCVE = strings.ToUpper(searchedCVE)
for _, cve := range cveList {
if severity != "" && (cvemodel.CompareSeverities(cve.Severity, severity) != 0) {
continue
}
if excludedCVE != "" && cve.ContainsStr(excludedCVE) {
continue
}
if cve.ContainsStr(searchedCVE) {
if shouldIncludeCVE(cve, searchedCVE, excludedCVE, severity) {
pageFinder.Add(cve)
}
}
pkg/extensions/search/cve/cve_internal_test.go
+52
View File
@@ -136,5 +136,57 @@ func TestUtils(t *testing.T) {
})
So(tags, ShouldBeEmpty)
})
Convey("shouldIncludeCVE filtering logic", func() {
baseCVE := cvemodel.CVE{
ID: "CVE-2024-0001",
Severity: "HIGH",
Title: "Test CVE 1",
Description: "Description contains keyword",
}
Convey("includes CVE when all filters pass", func() {
// No filters
So(shouldIncludeCVE(baseCVE, "", "", ""), ShouldBeTrue)
// Matching searchedCVE
So(shouldIncludeCVE(baseCVE, "CVE-2024", "", ""), ShouldBeTrue)
So(shouldIncludeCVE(baseCVE, "keyword", "", ""), ShouldBeTrue)
// Matching severity
So(shouldIncludeCVE(baseCVE, "", "", "HIGH"), ShouldBeTrue)
})
Convey("excludes CVE when severity doesn't match", func() {
So(shouldIncludeCVE(baseCVE, "", "", "LOW"), ShouldBeFalse)
So(shouldIncludeCVE(baseCVE, "", "", "MEDIUM"), ShouldBeFalse)
So(shouldIncludeCVE(baseCVE, "", "", "CRITICAL"), ShouldBeFalse)
})
Convey("excludes CVE when it contains excluded string", func() {
So(shouldIncludeCVE(baseCVE, "", "keyword", ""), ShouldBeFalse)
So(shouldIncludeCVE(baseCVE, "", "CVE-2024", ""), ShouldBeFalse)
So(shouldIncludeCVE(baseCVE, "", "Test CVE", ""), ShouldBeFalse)
})
Convey("excludes CVE when searchedCVE doesn't match", func() {
So(shouldIncludeCVE(baseCVE, "CVE-2023", "", ""), ShouldBeFalse)
So(shouldIncludeCVE(baseCVE, "notfound", "", ""), ShouldBeFalse)
})
Convey("handles multiple filters combined", func() {
// All filters match - should include
So(shouldIncludeCVE(baseCVE, "CVE-2024", "", "HIGH"), ShouldBeTrue)
// Severity matches but excluded - should exclude
So(shouldIncludeCVE(baseCVE, "", "keyword", "HIGH"), ShouldBeFalse)
// Searched matches but severity doesn't - should exclude
So(shouldIncludeCVE(baseCVE, "CVE-2024", "", "LOW"), ShouldBeFalse)
// Everything matches but excluded - should exclude
So(shouldIncludeCVE(baseCVE, "CVE-2024", "Test", "HIGH"), ShouldBeFalse)
})
})
})
}
pkg/extensions/search/resolver.go
+1 -28
View File
@@ -1440,34 +1440,7 @@ func expandedRepoInfo(ctx context.Context, repo string, metaDB mTypes.MetaDB, cv
dateSortedImages = append(dateSortedImages, imgSummary)
}
//nolint:varnamelen // standard comparison func signature
slices.SortFunc(dateSortedImages, func(a, b *gql_generated.ImageSummary) int {
// Handle nil and zero time cases: both are treated as oldest (come last in descending sort)
aIsZero := a.LastUpdated == nil || (a.LastUpdated != nil && a.LastUpdated.IsZero())
bIsZero := b.LastUpdated == nil || (b.LastUpdated != nil && b.LastUpdated.IsZero())
if aIsZero && bIsZero {
return 0
}
if aIsZero {
return 1 // a is zero/nil, b is not - a comes after b
}
if bIsZero {
return -1 // b is zero/nil, a is not - a comes before b
}
if a.LastUpdated.After(*b.LastUpdated) {
return -1
}
if a.LastUpdated.Equal(*b.LastUpdated) {
return 0
}
return 1
})
slices.SortFunc(dateSortedImages, pagination.ImgSortByUpdateTime)
return &gql_generated.RepoInfo{Summary: repoSummary, Images: dateSortedImages}, nil
}