Merge pull request #974 from CVEProject/jd-706

Resolves #706 Updated rejectCve endpoints to use the same validation as cna endpoints
CVEProject · Dec 22, 2022 · f0512ac · f0512ac
2 parents dd7b2a7 + 2bcc957
commit f0512ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/controller/cve.controller/cve.controller.js b/src/controller/cve.controller/cve.controller.js
@@ -474,7 +474,7 @@ async function rejectCVE (req, res, next) {
     const rejectedCve = Cve.newRejectedCve(cveIdObj, req.ctx.body, owningCnaShortName, providerMetadata)
     const newCveObj = new Cve({ cve: rejectedCve })
 
-    result = Cve.validateRejected(newCveObj)
+    result = Cve.validateCveRecord(newCveObj.cve)
     if (!result) {
       return res.status(500).json(error.serverError())
     }
@@ -540,7 +540,7 @@ async function rejectExistingCve (req, res, next) {
     // update CVE record to rejected
     const updatedRecord = Cve.updateCveToRejected(id, providerMetadata, result.cve, req.ctx.body)
     const updatedCve = new Cve({ cve: updatedRecord })
-    result = Cve.validateRejected(updatedCve)
+    result = Cve.validateCveRecord(updatedCve)
     if (!result) {
       return res.status(500).json(error.serverError())
     }

diff --git a/src/model/cve.js b/src/model/cve.js
@@ -7,8 +7,6 @@ const addFormats = require('ajv-formats')
 const ajv = new Ajv({ allErrors: true })
 addFormats(ajv)
 const validate = ajv.compile(cveSchemaV5)
-const rejectedContainerSchema = JSON.parse(fs.readFileSync('src/middleware/schemas/cnaContainer.json'))
-const validateCnaRejectedContainer = ajv.compile(rejectedContainerSchema)
 const getConstants = require('../constants').getConstants
 
 const schema = {
@@ -97,14 +95,6 @@ CveSchema.statics.newRejectedCve = function (cveIdObj, reqBody, owningCnaShortNa
   return rejectedRecord
 }
 
-CveSchema.statics.validateRejected = function (record) {
-  const result = validateCnaRejectedContainer(record)
-  if (result) {
-    return true
-  }
-  return false
-}
-
 CveSchema.statics.updateCveToRejected = function (id, providerMetadata, record, newCnaContainer) {
   const CONSTANTS = getConstants()