Skip to content

fix: skip UNK-* and Re cves #383

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.

Sign up for GitHub

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 4 commits into from
Oct 30, 2025
Merged

fix: skip UNK-* and Re cves #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
366d79b
fix: skip `UNK-*` and `Re` cves
DmitriyLewen Oct 30, 2025
739177f
fix: skip `UNK-*` and `Re` cves
DmitriyLewen Oct 30, 2025
1f03f00
refactor: compare cveID with `Re`
DmitriyLewen Oct 30, 2025
6187cda
chore: update comment
DmitriyLewen Oct 30, 2025
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
14 changes: 12 additions & 2 deletions photon/photon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,22 @@ func (c Config) Update() error {
return nil
}

func (c Config) saveCVEPerPkg(dirName, pkgName, cveID string, data interface{}) error {
func (c Config) saveCVEPerPkg(dirName, pkgName, cveID string, cve PhotonCVE) error {
if cveID == "" {
log.Printf("CVE-ID is empty")
return nil
}

// Only skip unknown CVE entries (IDs starting with "UNK-" or "Re") that lack version information.
// Valid CVEs (e.g., "CVE-...") with both ResVer and AffVer as "NA" are still saved,
// as their status (e.g., "Not Affected") may be meaningful for reporting.
if (strings.HasPrefix(cveID, "UNK-") || cveID == "Re") &&
(cve.ResVer == "" || cve.ResVer == "NA") &&
(cve.AffVer == "" || cve.AffVer == "NA") {
log.Printf("Skip unknown CVE entry: %s", cveID)
return nil
}

s := strings.Split(cveID, "-")
if len(s) != 3 {
log.Printf("invalid CVE-ID: %s", cveID)
Expand All @@ -101,7 +111,7 @@ func (c Config) saveCVEPerPkg(dirName, pkgName, cveID string, data interface{})

pkgDir := filepath.Join(c.VulnListDir, dirName, pkgName)
fileName := fmt.Sprintf("%s.json", cveID)
if err := utils.WriteJSON(c.AppFs, pkgDir, fileName, data); err != nil {
if err := utils.WriteJSON(c.AppFs, pkgDir, fileName, cve); err != nil {
return xerrors.Errorf("failed to write file: %w", err)
}
return nil
Expand Down
2 changes: 2 additions & 0 deletions photon/photon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ func TestConfig_Update(t *testing.T) {
"/tmp/photon/3.0/apache-tomcat/CVE-2019-0199.json": "testdata/golden/CVE-2019-0199.json",
"/tmp/photon/3.0/apache-tomcat/CVE-2019-10072.json": "testdata/golden/CVE-2019-10072.json",
"/tmp/photon/3.0/binutils/CVE-2017-16826.json": "testdata/golden/CVE-2017-16826.json",
"/tmp/photon/3.0/curl/CVE-2025-0725.json": "testdata/golden/CVE-2025-0725.json",
},
},
{
Expand Down Expand Up @@ -127,6 +128,7 @@ func TestConfig_Update(t *testing.T) {
"/tmp/photon/3.0/apache-tomcat/CVE-2019-0199.json": "testdata/golden/CVE-2019-0199.json",
"/tmp/photon/3.0/apache-tomcat/CVE-2019-10072.json": "testdata/golden/CVE-2019-10072.json",
"/tmp/photon/3.0/binutils/CVE-2017-16826.json": "testdata/golden/CVE-2017-16826.json",
"/tmp/photon/3.0/curl/CVE-2025-0725.json": "testdata/golden/CVE-2025-0725.json",
},
},
}
Expand Down
16 changes: 16 additions & 0 deletions photon/testdata/cve_data_photon3.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,21 @@
"cve_score": 7.8,
"aff_ver": "all versions before 2.31.1-3.ph3 are vulnerable",
"res_ver": "2.31.1-3.ph3"
},
{
"cve_id": "UNK-1",
"pkg": "curl-libs",
"cve_score": 6.7,
"aff_ver": "NA",
"res_ver": "NA",
"status": "Not Affected"
},
{
"cve_id": "CVE-2025-0725",
"pkg": "curl",
"cve_score": 7.3,
"aff_ver": "NA",
"res_ver": "NA",
"status": "Not Affected"
}
]
8 changes: 8 additions & 0 deletions photon/testdata/golden/CVE-2025-0725.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"os_version": "3.0",
"cve_id": "CVE-2025-0725",
"pkg": "curl",
"cve_score": 7.3,
"aff_ver": "NA",
"res_ver": "NA"
}