Skip to content

Commit 462911e

Browse files
feat(CSAF2.1): #455 update to new CSAF 2.1 schema and references to ssvc_v2 and cvss_v4_0_1.
1 parent 908c3ae commit 462911e

File tree

8 files changed

+438
-316
lines changed

8 files changed

+438
-316
lines changed

csaf_2_1/csafAjv.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,23 @@ import Ajv2020 from 'ajv/dist/2020.js'
33
import cvss_v2_0 from '../schemas/cvss-v2.0.js'
44
import cvss_v3_0 from '../schemas/cvss-v3.0.js'
55
import cvss_v3_1 from '../schemas/cvss-v3.1.js'
6-
import cvss_v4_0 from './csafAjv/cvss-v4.0.js'
6+
import cvss_v4_0_1 from './csafAjv/cvss-v4.0.1.js'
77
import meta from './csafAjv/meta.js'
8+
import draft_07_schema from './csafAjv/draft-07-schema.js'
89
import formatAssertion from './csafAjv/format-assertion.js'
9-
import ssvcDecisionPointValueSelection from './csafAjv/Decision_Point_Value_Selection-1-0-1.js'
10-
import ssvcDecisionPoint from './csafAjv/Decision_Point-1-0-1.js'
10+
import ssvcDecisionPointValueSelection from './csafAjv/Decision_Point_Value_Selection-2-0-0.js'
1111
import { timestampRegex, validateTimestamp } from './dateHelper.js'
1212

1313
const csafAjv = new Ajv2020({ strict: false, allErrors: true })
1414
addFormats(csafAjv)
15+
csafAjv.addMetaSchema(
16+
draft_07_schema,
17+
'http://json-schema.org/draft-07/schema#'
18+
)
1519
csafAjv.addSchema(cvss_v2_0, 'https://www.first.org/cvss/cvss-v2.0.json')
1620
csafAjv.addSchema(cvss_v3_0, 'https://www.first.org/cvss/cvss-v3.0.json')
1721
csafAjv.addSchema(cvss_v3_1, 'https://www.first.org/cvss/cvss-v3.1.json')
18-
csafAjv.addSchema(cvss_v4_0, 'https://www.first.org/cvss/cvss-v4.0.json')
22+
csafAjv.addSchema(cvss_v4_0_1, 'https://www.first.org/cvss/cvss-v4.0.1.json')
1923
csafAjv.addSchema(
2024
meta,
2125
'https://docs.oasis-open.org/csaf/csaf/v2.1/schema/meta.json'
@@ -26,11 +30,7 @@ csafAjv.addSchema(
2630
)
2731
csafAjv.addSchema(
2832
ssvcDecisionPointValueSelection,
29-
'https://certcc.github.io/SSVC/data/schema/v1/Decision_Point_Value_Selection-1-0-1.schema.json'
30-
)
31-
csafAjv.addSchema(
32-
ssvcDecisionPoint,
33-
'https://certcc.github.io/SSVC/data/schema/v1/Decision_Point-1-0-1.schema.json'
33+
'https://certcc.github.io/SSVC/data/schema/v2/Decision_Point_Value_Selection-2-0-0.schema.json'
3434
)
3535

3636
csafAjv.addFormat('date-time', {

csaf_2_1/csafAjv/Decision_Point-1-0-1.js

Lines changed: 0 additions & 106 deletions
This file was deleted.

csaf_2_1/csafAjv/Decision_Point_Value_Selection-1-0-1.js

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)