Merge branch 'dev' into dependabot/npm_and_yarn/postcss-8.5.13

Author: david-rocca

.gitignore

@@ -107,3 +107,7 @@ commit-message.txt
 # configuration) and provide an example instead
 docker/.docker-env
 
+**/export.xlsx
+**/poc_admin_report.csv
+**/~$*.xlsx
+src/scripts/importDb.sh

api-docs/openapi.json

@@ -23,7 +23,8 @@
         "mocha": "^10.8.2",
         "nyc": "^15.1.0",
         "sinon": "^15.0.4",
-        "standard": "^16.0.3"
+        "standard": "^16.0.3",
+        "xlsx": "^0.18.5"
     },
     "dependencies": {
         "ajv": "^8.6.2",
@@ -81,6 +82,7 @@
         "lint:test-utils": "node node_modules/eslint/bin/eslint.js test-utils/ --fix",
         "populate:dev": "NODE_ENV=development node-dev src/scripts/populate.js",
         "migrate:dev": "NODE_ENV=development MONGO_CONN_STRING=mongodb://localhost:27017 MONGO_DB_NAME=cve_dev node-dev src/scripts/migrate.js",
+        "migrate:dev:monday": "NODE_ENV=development MONGO_CONN_STRING=mongodb://localhost:27017 MONGO_DB_NAME=cve_dev node-dev src/scripts/MondayMigrate.js",
         "migrate:test-black-box": "NODE_ENV=development MONGO_CONN_STRING=mongodb://docdb:27017 MONGO_DB_NAME=cve_dev node-dev src/scripts/migrate.js",
         "migrate:test": "NODE_ENV=test MONGO_CONN_STRING=mongodb://localhost:27017 MONGO_DB_NAME=cve_test node-dev src/scripts/migrate.js",
         "populate:stage": "NODE_ENV=staging node src/scripts/populate.js",
@@ -90,6 +92,8 @@
         "populate-cve:stage": "NODE_ENV=staging node src/scripts/populate-cve.js",
         "populate-cve:int": "NODE_ENV=integration node src/scripts/populate-cve.js",
         "populate-cve:prd": "NODE_ENV=production node src/scripts/populate-cve.js",
+        "generate": "NODE_ENV=test node src/scripts/test_data/generate.js",
+        "reset-keys": "NODE_ENV=test node src/scripts/test_data/reset_keys.js",
         "start:dev": "node src/swagger.js && TZ=utc NODE_ENV=development node src/scripts/updateOpenapiHost.js && TZ=utc NODE_ENV=development node-dev src/index.js",
         "dev": "node src/swagger.js && TZ=utc NODE_ENV=development node src/scripts/updateOpenapiHost.js && TZ=utc NODE_ENV=development node-dev src/index.js",
         "start:stage": "node src/swagger.js && NODE_ENV=staging node src/scripts/updateOpenapiHost.js && NODE_ENV=staging node src/index.js",

package-lock.json

@@ -5,7 +5,7 @@
     "glossary": {
       "type": "array",
       "items": {
-        "type": "object"
+        "$ref": "glossary.json"
       }
     }
   },

package.json

@@ -10,7 +10,7 @@
       "description": "A version 4 (random) universally unique identifier (UUID) as defined by [RFC 4122](https://tools.ietf.org/html/rfc4122#section-4.1.3).",
       "type": "string",
       "format": "uuid",
-      "pattern": "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$"
+      "pattern": "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$"
     },
     "uriType": {
       "description": "A universal resource identifier (URI), according to [RFC 3986](https://tools.ietf.org/html/rfc3986).",
@@ -43,7 +43,7 @@
         "ROOT"
       ]
     },
-    "partnerRoleType": {
+    "partnerRoleTypeValue": {
       "description": "The type of role a partner holds",
       "type": "string",
       "enum": [
@@ -57,6 +57,14 @@
         "Researcher",
         "Vendor"
       ]
+    },
+    "partnerRoleType": {
+      "description": "The types of roles a partner holds",
+      "type": "array",
+      "uniqueItems": true,
+      "items": {
+        "$ref": "#/definitions/partnerRoleTypeValue"
+      }
     }
   },
   "properties": {
@@ -106,18 +114,12 @@
         "$ref": "#/definitions/uuidType"
       }
     },
-    "hard_quota": {
+    "id_quota": {
       "description": "The maximum number of CVE IDs this organization can reserve.",
       "type": "integer",
       "minimum": 0,
       "maximum": 100000
     },
-    "soft_quota": {
-      "description": "The threshold for notifying the organization about their remaining CVE ID count.",
-      "type": "integer",
-      "minimum": 0,
-      "maximum": 100000
-    },
     "private_contacts": {
       "type": "array",
       "items": {
@@ -167,7 +169,7 @@
       "properties": {
         "cve_website_update_date": {
           "type": "string",
-          "format": "date-time"
+          "format": "date"
         },
         "cve_website_update_needed": {
           "type": "boolean"
@@ -182,15 +184,6 @@
         },
         "status": {
           "type": "string"
-        },
-        "advisory_location_require_credentials": {
-          "type": "boolean"
-        },
-        "vulnerability_advisory_location_for_web_scraping": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
         }
       },
       "additionalProperties": false
@@ -201,6 +194,15 @@
         "type": "string"
       }
     },
+    "advisory_location_require_credentials": {
+      "type": "boolean"
+    },
+    "vulnerability_advisory_location_for_web_scraping": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
     "industry": {
       "type": "string"
     },
@@ -225,4 +227,4 @@
     "short_name",
     "long_name"
   ]
-}
+}