Merge remote-tracking branch 'origin/date-handling-using-temporal-api' into 197-csaf-2.1-recommended-test-6.2.41

Author: bendo-eXX

csaf_2_1/csafAjv.js

@@ -0,0 +1,43 @@
+import addFormats from 'ajv-formats'
+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 meta from './csafAjv/meta.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 { timestampRegex, validateTimestamp } from './dateHelper.js'
+
+const csafAjv = new Ajv2020({ strict: false, allErrors: true })
+addFormats(csafAjv)
+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(
+  meta,
+  'https://docs.oasis-open.org/csaf/csaf/v2.1/schema/meta.json'
+)
+csafAjv.addSchema(
+  formatAssertion,
+  'https://json-schema.org/draft/2020-12/meta/format-assertion'
+)
+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'
+)
+
+csafAjv.addFormat('date-time', {
+  type: 'string',
+  validate: (v) => {
+    return timestampRegex.test(v) && validateTimestamp(v)
+  },
+})
+
+export default csafAjv

lib/shared/csafAjv/Decision_Point-1-0-1.js renamed to csaf_2_1/csafAjv/Decision_Point-1-0-1.js

@@ -0,0 +1,47 @@
+import { Temporal } from 'temporal-polyfill'
+
+/**
+ * compare iso timestamps
+ * returns a negative number if a is less than b, positive if a is greater than b, and zero if they are equal.
+ * This function also returns 0 if one of the given values could not be parsed.
+ *
+ * @param {string} a
+ * @param {string} b
+ */
+export const compareZonedDateTimes = (a, b) => {
+  try {
+    const duration = Temporal.Instant.from(b).until(Temporal.Instant.from(a))
+    return duration.sign
+  } catch (e) {
+    return 0
+  }
+}
+
+/**
+ * This regex validates a date against RFC 3339 section 5.6.
+ * See: https://datatracker.ietf.org/doc/html/rfc3339#section-5.6
+ */
+export const timestampRegex =
+  /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$/
+
+/**
+ * Checks if the given string is a semantically correct timestamp (RFC 3339). With one
+ * exception: It does not allow leap seconds.
+ *
+ * @param {string} v
+ * @returns
+ */
+export const validateTimestamp = (v) => {
+  try {
+    // Temporal.Instant.from() throws an error if the date is invalid. But they
+    // normalize the date if e.g. there are 60 seconds (leap second) ...
+    Temporal.Instant.from(v)
+
+    // ... To handle that case we additionally use the date constructor which
+    // does not allow more than 59 seconds at all.
+    if (Number.isNaN(new Date(v).getTime())) return false
+    return true
+  } catch (e) {
+    return false
+  }
+}