ROX-28353: use NVD 2.0 JSON feeds (#2015)

.github/workflows/ci.yaml

@@ -162,7 +162,7 @@ jobs:
       contains(github.event.pull_request.labels.*.name, 'generate-dumps-on-pr')
     env:
       NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
-      ROX_LEGACY_NVD_LOADER: true
+      ROX_NVD_FEED_LOADER: true
     runs-on: ubuntu-latest
     needs:
       - pre-build-updater

cmd/clair/main.go

@@ -113,7 +113,8 @@ func Boot(config *Config, slimMode bool) {
 	go func() {
 		defer wg.Add(-1)
 		var err error
-		db, err = database.OpenWithRetries(config.Database, true, 30, 10*time.Second)
+		// Wait for the DB to be ready: 10 minutes.
+		db, err = database.OpenWithRetries(config.Database, true, 60, 10*time.Second)
 		if err != nil {
 			log.WithError(err).Fatal("Failed to open database despite multiple retries...")
 		}

e2etests/testcase_test.go

@@ -4028,7 +4028,7 @@ All OpenShift Container Platform 4.10 users are advised to upgrade to these upda
 				Name:          "tomcat",
 				VersionFormat: component.JavaSourceType.String(),
 				Version:       "9.0.59",
-				FixedBy:       "9.0.104",
+				FixedBy:       "9.0.107",
 				Location:      "tomcat-embed-core-9.0.59.jar",
 				Vulnerabilities: []apiV1.Vulnerability{
 					{
@@ -4056,7 +4056,7 @@ All OpenShift Container Platform 4.10 users are advised to upgrade to these upda
 					},
 					{
 						Name:        "CVE-2023-28708",
-						Description: "\nWhen using the RemoteIpFilter with requests received from a    reverse proxy via HTTP that include the X-Forwarded-Proto    header set to https, session cookies created by Apache Tomcat 11.0.0-M1 to 11.0.0.-M2, 10.1.0-M1 to 10.1.5, 9.0.0-M1 to 9.0.71 and 8.5.0 to 8.5.85 did not\u00a0include the secure attribute. This could result in the user agent\u00a0transmitting the session cookie over an insecure channel.\n\n\n\n\n\n\n\n",
+						Description: "When using the RemoteIpFilter with requests received from a    reverse proxy via HTTP that include the X-Forwarded-Proto    header set to https, session cookies created by Apache Tomcat 11.0.0-M1 to 11.0.0.-M2, 10.1.0-M1 to 10.1.5, 9.0.0-M1 to 9.0.71 and 8.5.0 to 8.5.85 did not\u00a0include the secure attribute. This could result in the user agent\u00a0transmitting the session cookie over an insecure channel.\n\nOlder, EOL versions may also be affected.",
 						Link:        "https://nvd.nist.gov/vuln/detail/CVE-2023-28708",
 						Severity:    "Moderate",
 						FixedBy:     "9.0.72",
@@ -4797,7 +4797,7 @@ All OpenShift Container Platform 4.10 users are advised to upgrade to these upda
 				NamespaceName: "rhel:8",
 				VersionFormat: "rpm",
 				Version:       "1:17.0.11.0.9-2.el8.x86_64",
-				FixedBy:       "1:17.0.15.0.6-2.el8",
+				FixedBy:       "1:17.0.16.0.8-2.el8",
 				AddedBy:       "sha256:06c7a3d491f551a56296ccb9bee8a68c83776991e73a9005e8b5ebb533002097",
 			},
 		},
@@ -4816,7 +4816,7 @@ All OpenShift Container Platform 4.10 users are advised to upgrade to these upda
 				NamespaceName: "rhel:8",
 				VersionFormat: "rpm",
 				Version:       "1:17.0.13.0.11-3.el8.x86_64",
-				FixedBy:       "1:17.0.15.0.6-2.el8",
+				FixedBy:       "1:17.0.16.0.8-2.el8",
 				AddedBy:       "sha256:2f7b9495af5ddc85b0be7ca9411fddb54f37999ea73b03cbf1115dd0c5bd4f95",
 			},
 		},

pkg/env/list.go

@@ -41,9 +41,9 @@ var (
 	// MaxGrpcConcurrentStreams configures the maximum number of HTTP/2 streams to use with gRPC
 	MaxGrpcConcurrentStreams = RegisterIntegerSetting("ROX_GRPC_MAX_CONCURRENT_STREAMS", DefaultMaxGrpcConcurrentStreams)
 
-	// LegacyNVDLoader when true will cause the loader to pull NVD data using
-	// the NVD Legacy Data Feeds, if false will pull from the NVD 2.0 API.
-	LegacyNVDLoader = RegisterBooleanSetting("ROX_LEGACY_NVD_LOADER", false)
+	// NVDFeedLoader when true will cause the loader to pull NVD data using
+	// the NVD 2.0 Data Feeds. If false, the loader will pull from the NVD 2.0 API.
+	NVDFeedLoader = RegisterBooleanSetting("ROX_NVD_FEED_LOADER", false)
 
 	// RHLineage when true will cause all parent layers (a.k.a lineage) to be considered when
 	// storing scan results for RHEL image layers.

pkg/vulnloader/nvdloader/convert.go

@@ -14,7 +14,7 @@ const (
 	jsonTimeFormat = "2006-01-02T15:04Z"
 )
 
-func toJSON(vulns []*apischema.CVEAPIJSON20DefCVEItem) ([]*jsonschema.NVDCVEFeedJSON10DefCVEItem, error) {
+func toJSON10(vulns []*apischema.CVEAPIJSON20DefCVEItem) ([]*jsonschema.NVDCVEFeedJSON10DefCVEItem, error) {
 	if vulns == nil {
 		return nil, nil
 	}
@@ -31,6 +31,11 @@ func toJSON(vulns []*apischema.CVEAPIJSON20DefCVEItem) ([]*jsonschema.NVDCVEFeed
 			continue
 		}
 
+		// Ignore rejected vulnerabilities.
+		if strings.EqualFold(vuln.CVE.VulnStatus, "Rejected") {
+			continue
+		}
+
 		cve := vuln.CVE
 
 		modifiedTime, err := toTime(cve.LastModified)
@@ -152,14 +157,18 @@ func toBaseMetricV2(metrics []*apischema.CVEAPIJSON20CVSSV2) *jsonschema.NVDCVEF
 }
 
 func toBaseMetricV3(metrics30 []*apischema.CVEAPIJSON20CVSSV30, metrics31 []*apischema.CVEAPIJSON20CVSSV31) *jsonschema.NVDCVEFeedJSON10DefImpactBaseMetricV3 {
-	switch {
-	case len(metrics31) != 0:
-		return toBaseMetricV31(metrics31)
-	case len(metrics30) != 0:
-		return toBaseMetricV30(metrics30)
-	default:
-		return nil
+	// Prefer CVSS 3.1.
+	baseMetric := toBaseMetricV31(metrics31)
+	if baseMetric != nil {
+		return baseMetric
 	}
+
+	baseMetric = toBaseMetricV30(metrics30)
+	if baseMetric != nil {
+		return baseMetric
+	}
+
+	return nil
 }
 
 func toBaseMetricV31(metrics []*apischema.CVEAPIJSON20CVSSV31) *jsonschema.NVDCVEFeedJSON10DefImpactBaseMetricV3 {

pkg/vulnloader/nvdloader/convert_test.go

@@ -0,0 +1,130 @@
+package nvdloader
+
+import (
+	"os"
+	"testing"
+
+	jsonschema "github.com/facebookincubator/nvdtools/cvefeed/nvd/schema"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestToJSON10(t *testing.T) {
+	f, err := os.Open("testdata/nvdcve-2.0-2025.json")
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		require.NoError(t, f.Close())
+	})
+
+	cveAPI, err := parseReader(f)
+	require.NoError(t, err)
+
+	cveFeed, err := toJSON10(cveAPI.Vulnerabilities)
+	assert.NoError(t, err)
+
+	expected := []*jsonschema.NVDCVEFeedJSON10DefCVEItem{
+		{
+			CVE: &jsonschema.CVEJSON40{
+				CVEDataMeta: &jsonschema.CVEJSON40CVEDataMeta{
+					ID: "CVE-2025-0168",
+				},
+				Description: &jsonschema.CVEJSON40Description{
+					DescriptionData: []*jsonschema.CVEJSON40LangString{
+						{
+							Lang:  "en",
+							Value: "A vulnerability classified as critical has been found in code-projects Job Recruitment 1.0. This affects an unknown part of the file /_parse/_feedback_system.php. The manipulation of the argument person leads to sql injection. It is possible to initiate the attack remotely. The exploit has been disclosed to the public and may be used.",
+						},
+					},
+				},
+			},
+			Configurations: &jsonschema.NVDCVEFeedJSON10DefConfigurations{
+				Nodes: []*jsonschema.NVDCVEFeedJSON10DefNode{
+					{
+						CPEMatch: []*jsonschema.NVDCVEFeedJSON10DefCPEMatch{
+							{
+								Cpe23Uri:   "cpe:2.3:a:anisha:job_recruitment:1.0:*:*:*:*:*:*:*",
+								Vulnerable: true,
+							},
+						},
+						Operator: "OR",
+					},
+				},
+			},
+			Impact: &jsonschema.NVDCVEFeedJSON10DefImpact{
+				BaseMetricV3: &jsonschema.NVDCVEFeedJSON10DefImpactBaseMetricV3{
+					CVSSV3: &jsonschema.CVSSV30{
+						AttackComplexity:      "LOW",
+						AttackVector:          "NETWORK",
+						AvailabilityImpact:    "NONE",
+						BaseScore:             7.5,
+						BaseSeverity:          "HIGH",
+						ConfidentialityImpact: "HIGH",
+						IntegrityImpact:       "NONE",
+						PrivilegesRequired:    "NONE",
+						Scope:                 "UNCHANGED",
+						UserInteraction:       "NONE",
+						VectorString:          "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:N/A:N",
+						Version:               "3.1",
+					},
+					ExploitabilityScore: 3.9,
+					ImpactScore:         3.6,
+				},
+			},
+			LastModifiedDate: "2025-02-25T21:26Z",
+			PublishedDate:    "2025-01-01T14:15Z",
+		},
+		{
+			CVE: &jsonschema.CVEJSON40{
+				CVEDataMeta: &jsonschema.CVEJSON40CVEDataMeta{
+					ID: "CVE-2025-22144",
+				},
+				Description: &jsonschema.CVEJSON40Description{
+					DescriptionData: []*jsonschema.CVEJSON40LangString{
+						{
+							Lang:  "en",
+							Value: "NamelessMC is a free, easy to use & powerful website software for Minecraft servers. A user with admincp.core.emails or admincp.users.edit permissions can validate users and an attacker can reset their password. When the account is successfully approved by email the reset code is NULL, but when the account is manually validated by a user with admincp.core.emails or admincp.users.edit permissions then the reset_code will no longer be NULL but empty. An attacker can request http://localhost/nameless/index.php?route=/forgot_password/&c= and reset the password. As a result an attacker may compromise another users password and take over their account. This issue has been addressed in release version 2.1.3 and all users are advised to upgrade. There are no known workarounds for this vulnerability.",
+						},
+					},
+				},
+			},
+			Configurations: &jsonschema.NVDCVEFeedJSON10DefConfigurations{
+				Nodes: []*jsonschema.NVDCVEFeedJSON10DefNode{
+					{
+						CPEMatch: []*jsonschema.NVDCVEFeedJSON10DefCPEMatch{
+							{
+								Cpe23Uri:            "cpe:2.3:a:namelessmc:nameless:*:*:*:*:*:*:*:*",
+								VersionEndExcluding: "2.1.3",
+								Vulnerable:          true,
+							},
+						},
+						Operator: "OR",
+					},
+				},
+			},
+			Impact: &jsonschema.NVDCVEFeedJSON10DefImpact{
+				BaseMetricV3: &jsonschema.NVDCVEFeedJSON10DefImpactBaseMetricV3{
+					CVSSV3: &jsonschema.CVSSV30{
+						AttackComplexity:      "LOW",
+						AttackVector:          "NETWORK",
+						AvailabilityImpact:    "HIGH",
+						BaseScore:             9.8,
+						BaseSeverity:          "CRITICAL",
+						ConfidentialityImpact: "HIGH",
+						IntegrityImpact:       "HIGH",
+						PrivilegesRequired:    "NONE",
+						Scope:                 "UNCHANGED",
+						UserInteraction:       "NONE",
+						VectorString:          "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H",
+						Version:               "3.1",
+					},
+					ExploitabilityScore: 3.9,
+					ImpactScore:         5.9,
+				},
+			},
+			LastModifiedDate: "2025-05-13T15:42Z",
+			PublishedDate:    "2025-01-13T20:15Z",
+		},
+	}
+
+	assert.ElementsMatch(t, expected, cveFeed)
+}