Merge pull request #456 from secvisogram/feat/455-csaf2.1-update-to-new-schemas

feat(CSAF2.1): #455 update to new  CSAF 2.1 schema with ssvc_v2 and cvss_v4_0_1.

Author: rainer-exxcellent

csaf_2_1/csafAjv.js

@@ -3,19 +3,23 @@ import Ajv2020 from 'ajv/dist/2020.js'
 import cvss_v2_0 from '../schemas/cvss-v2.0.js'
 import cvss_v3_0 from '../schemas/cvss-v3.0.js'
 import cvss_v3_1 from '../schemas/cvss-v3.1.js'
-import cvss_v4_0 from './csafAjv/cvss-v4.0.js'
+import cvss_v4_0_1 from './csafAjv/cvss-v4.0.1.js'
 import meta from './csafAjv/meta.js'
+import draft_07_schema from './csafAjv/draft-07-schema.js'
 import formatAssertion from './csafAjv/format-assertion.js'
-import ssvcDecisionPointValueSelection from './csafAjv/Decision_Point_Value_Selection-1-0-1.js'
-import ssvcDecisionPoint from './csafAjv/Decision_Point-1-0-1.js'
+import ssvcDecisionPointValueSelection from './csafAjv/Decision_Point_Value_Selection-2-0-0.js'
 import { timestampRegex, validateTimestamp } from './dateHelper.js'
 
 const csafAjv = new Ajv2020({ strict: false, allErrors: true })
 addFormats(csafAjv)
+csafAjv.addMetaSchema(
+  draft_07_schema,
+  'http://json-schema.org/draft-07/schema#'
+)
 csafAjv.addSchema(cvss_v2_0, 'https://www.first.org/cvss/cvss-v2.0.json')
 csafAjv.addSchema(cvss_v3_0, 'https://www.first.org/cvss/cvss-v3.0.json')
 csafAjv.addSchema(cvss_v3_1, 'https://www.first.org/cvss/cvss-v3.1.json')
-csafAjv.addSchema(cvss_v4_0, 'https://www.first.org/cvss/cvss-v4.0.json')
+csafAjv.addSchema(cvss_v4_0_1, 'https://www.first.org/cvss/cvss-v4.0.1.json')
 csafAjv.addSchema(
   meta,
   'https://docs.oasis-open.org/csaf/csaf/v2.1/schema/meta.json'
@@ -26,11 +30,7 @@ csafAjv.addSchema(
 )
 csafAjv.addSchema(
   ssvcDecisionPointValueSelection,
-  'https://certcc.github.io/SSVC/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json'
-)
-csafAjv.addSchema(
-  ssvcDecisionPoint,
-  'https://certcc.github.io/SSVC/data/schema/v1/Decision_Point-1-0-1.schema.json'
+  'https://certcc.github.io/SSVC/data/schema/v2/Decision_Point_Value_Selection-2-0-0.schema.json'
 )
 
 csafAjv.addFormat('date-time', {