Pivot the validation error reporting by assigner.

chandanbn · chandanbn · commit 9280727e7c05 · 2022-02-11T22:48:23.000-08:00
diff --git a/schema/v5.0/support/Node_Validator/reportValidation.js b/schema/v5.0/support/Node_Validator/reportValidation.js
@@ -7,6 +7,7 @@ const docs= {
 '/containers/cna/metrics/cvssV3_0:required': "CVSS objects are incomplete. Please provide a valid vectorString at the minimum in your CVE-JSON v4 submission."
 
 }
+/*
 function cvePath(value) {
   var realId = value.match(/(CVE-(\d{4})-(\d{1,12})(\d{3}))/);
   if (realId) {
@@ -16,14 +17,16 @@ function cvePath(value) {
     return (year + '/' + bucket + 'xxx/' + id + '.json')
   }
 }
-
+*/
 const validateCve = require('./dist/cve5validator.js')
 var errorStat = {};
+var warnStat = {};
 var errorCount = {};
 var yStat = {};
 var invalid = 0;
+var warns = 0;
 var total = 0;
-var ignore = { '': 1, '/cveMetadata/state': 1 }
+var ignore = { '': 1, '/cveMetadata/state': 1, '/containers/cna/references/url': 1}
 function validate(line) {
   if (line) {
     var parts = line.match(/(CVE-(\d+)-\d+)/);
@@ -37,7 +40,8 @@ function validate(line) {
       if (!fs.lstatSync(line).isDirectory()) {
         var cveFile = fs.readFileSync(line);
         var cve = JSON.parse(cveFile);
-        delete cve.x_ValidationErrors;
+        var warnings = cve.containers?.cna.x_ConverterErrors;
+        //delete cve.x_ValidationErrors;
         var assigner = "default";
         try {
           assigner = cve.containers?.cna?.x_legacyV4Record?.CVE_data_meta?.ASSIGNER;
@@ -48,27 +52,52 @@ function validate(line) {
           console.error(e.message);
         }
         total++;
+
+        if(warnings) {
+          warns++;
+          errorCount[assigner]++;
+          for (const key in warnings) {
+            var w = 'Warning: ' + warnings[key].error;
+            //console.log(key);
+            if(!errorStat[assigner]) {
+              errorStat[assigner] = {}
+              errorCount[assigner] = 0
+            }
+            if(!errorStat[assigner][key]) {
+              errorStat[assigner][key] = [];
+            }
+            if(!errorStat[assigner][key][w]) {
+              errorStat[assigner][key][w] = [];
+            }
+            errorStat[assigner][key][w].push(id);
+          }
+        }
         var valid = validateCve(cve);
         if (!valid) {
-          yStat[year] ? yStat[year]++ : (yStat[year] = 1);
-          invalid++;
+          var errseen = false;
           validateCve.errors.forEach(err => {
             var path = err.instancePath.replace(/\/\d+\/?/g, "/")
             if (!ignore[path]) {
-              if (!errorStat[path]) {
-                errorStat[path] = {}
-                errorCount[path] = 0
+              var e = 'Error: ' + err.keyword;
+              if (!errorStat[assigner]) {
+                errorStat[assigner] = {}
+                errorCount[assigner] = 0
               }
-              if (!errorStat[path][err.keyword]) {
-                errorStat[path][err.keyword] = {}
+              if (!errorStat[assigner][path]) {
+                errorStat[assigner][path] = {}
               }
-              if (!errorStat[path][err.keyword][assigner]) {
-                errorStat[path][err.keyword][assigner] = []
+              if (!errorStat[assigner][path][e]) {
+                errorStat[assigner][path][e] = []
               }
-              errorStat[path][err.keyword][assigner].push(id);
-              errorCount[path]++;
+              errorStat[assigner][path][e].push(id);
+              errseen = true;
             }
           });
+          if (errseen) {
+            errorCount[assigner]++;
+            invalid++;
+            yStat[year] ? yStat[year]++ : (yStat[year] = 1);
+          }
         }
       }
     } catch (e) {
@@ -107,24 +136,25 @@ function report() {
   }
   </style></head>
   <body><h2>
-  Validation errors in ${invalid} out of ${total} upconverted CVEs.
+  ${warns} warnings and ${invalid} errors out of ${total} upconverted CVEs.
   </h2>
   `)
   for (const y in yStat) {
     console.log(`<li>year ${y} - ${yStat[y]}</li>`)
   }
+
   Object.keys(errorStat).sort().forEach(x => {
-    console.log(`<h3>${x} [${errorCount[x]}]</h3>`)
+    console.log(`<h3 id=${x}>${x} <a href="#${x}">[link]</a></h3>`)
     for (const k in errorStat[x]) {
       var alist = errorStat[x][k];
       for (const a in alist) {
-        console.log(`<details id="${x}-${k}-${a}"><summary>${k} error [${alist[a].length}] - ${a} <a href="#${x}-${k}-${a}">[link]</a>:</summary>`)
+        var ids = [...new Set(alist[a])];
+        console.log(`<details id="${x}-${k}-${a}"><summary>${a} ${k} [${ids.length}] <a href="#${x}-${k}-${a}">[link]</a>:</summary>`)
         if(docs[x + ':' + k]) {
           console.log(`<p>`+docs[x + ':' + k]+'</p>')
         }
         console.log('<blockquote class="grid">')
-        for (const c of alist[a]) {
-          var p = cvePath(c)
+        for (const c of ids.sort()) {
           console.log(` <a href="https://vulnogram.github.io/seaview?${c}">${c}</a>`)
         }
         console.log('</blockquote></details>')
