Merge branch 'master' into checklistView

.github/workflows/hdfconverter-tests.yml

@@ -12,7 +12,7 @@ jobs:
 
     services:
       splunk:
-        image: splunk/splunk:9.1.2
+        image: splunk/splunk
         volumes:
           - /$(pwd)/test/configs/splunk/server.conf:/etc/system/local/server.conf
         ports:

.github/workflows/release-server-to-docker.yml

@@ -3,6 +3,11 @@ name: Push Heimdall Server to Docker Hub on every release and tag as release-lat
 on:
   release:
     types: [published]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version'     
+        required: true
 
 jobs:
   docker:
@@ -20,7 +25,7 @@ jobs:
         id: format-tag
         with:
           pattern: 'v'
-          string: '${{ github.event.release.tag_name }}'
+          string: '${{ github.event.release.tag_name || github.event.inputs.version}}'
           replace-with: ''
           flags: 'g'
       - name: Checkout the Heimdall Repository
@@ -36,7 +41,7 @@ jobs:
       - name: Get Docker SHA
         shell: bash
         id: get-docker-sha
-        run: echo "DOCKER_SHA=$(docker inspect --format='{{index .RepoDigests 0}}' mitre/heimdall2:${{ steps.format-tag.outputs.replaced }} | cut -d '@' -f 2" >> $GITHUB_ENV
+        run: echo "DOCKER_SHA=$(docker pull mitre/heimdall2:${{ steps.format-tag.outputs.replaced }} > /dev/null 2>&1 && docker inspect --format='{{index .RepoDigests 0}}' mitre/heimdall2:${{ steps.format-tag.outputs.replaced }} | cut -d '@' -f 2)" >> $GITHUB_ENV
       - name: Sophos Factory pipeline
         uses: sophos/factory-run-pipeline@v2
         with:

CHANGELOG

@@ -1,3 +1,148 @@
+v2.10.10
+
+- Revert "Bump tw-elements from 1.1.0 to 2.0.0" @charleshu-8 (#5894)
+
+## Dependency Updates
+
+- Bump tw-elements from 1.1.0 to 2.0.0 @dependabot (#5602)
+- Bump tailwindcss from 3.4.3 to 3.4.4 @dependabot (#5893)
+- Bump @aws-sdk/client-s3 from 3.590.0 to 3.591.0 @dependabot (#5892)
+- Bump @types/node from 20.14.1 to 20.14.2 @dependabot (#5891)
+- Bump prettier from 3.3.0 to 3.3.1 @dependabot (#5890)
+- Bump @nestjs/platform-express from 10.3.8 to 10.3.9 @dependabot (#5878)
+- Bump pg from 8.11.5 to 8.12.0 @dependabot (#5886)
+- Bump cypress from 13.10.0 to 13.11.0 @dependabot (#5885)
+- Bump @aws-sdk/client-s3 from 3.588.0 to 3.590.0 @dependabot (#5888)
+- Bump @aws-sdk/client-config-service from 3.588.0 to 3.590.0 @dependabot (#5884)
+- Bump @nestjs/core from 10.3.8 to 10.3.9 @dependabot (#5876)
+- Bump express-rate-limit from 7.2.0 to 7.3.0 @dependabot (#5882)
+- Bump yaml from 2.4.2 to 2.4.3 @dependabot (#5881)
+- Bump prettier from 3.2.5 to 3.3.0 @dependabot (#5875)
+- Bump tsx from 4.11.0 to 4.11.2 @dependabot (#5877)
+- Bump @types/node from 20.13.0 to 20.14.1 @dependabot (#5873)
+- Bump @nestjs/common from 10.3.8 to 10.3.9 @dependabot (#5880)
+- Bump @nestjs/testing from 10.3.8 to 10.3.9 @dependabot (#5874)
+- Bump @types/node from 20.12.13 to 20.13.0 @dependabot (#5871)
+- Bump @aws-sdk/client-config-service from 3.583.0 to 3.588.0 @dependabot (#5870)
+- Bump @aws-sdk/client-s3 from 3.587.0 to 3.588.0 @dependabot (#5867)
+- Bump @aws-sdk/client-s3 from 3.583.0 to 3.587.0 @dependabot (#5863)
+- Bump @aws-sdk/client-sts from 3.583.0 to 3.587.0 @dependabot (#5862)
+- Bump eslint-plugin-cypress from 3.2.0 to 3.3.0 @dependabot (#5861)
+- Bump @types/node from 20.12.12 to 20.12.13 @dependabot (#5860)
+
+v2.10.9
+
+- Add option to normalize export ckl profile name @georgedias (#5852)
+- Sequelize fix for Windows dev configuration @georgedias (#5851)
+
+## Dependency Updates
+
+- Bump ts-jest from 29.1.3 to 29.1.4 @dependabot (#5859)
+- Bump @aws-sdk/client-s3 from 3.582.0 to 3.583.0 @dependabot (#5854)
+- Bump cypress from 13.9.0 to 13.10.0 @dependabot (#5844)
+- Bump tsx from 4.10.5 to 4.11.0 @dependabot (#5855)
+- Bump @aws-sdk/client-config-service from 3.582.0 to 3.583.0 @dependabot (#5853)
+- Bump @aws-sdk/client-s3 from 3.577.0 to 3.582.0 @dependabot (#5849)
+- Bump @aws-sdk/client-config-service from 3.577.0 to 3.582.0 @dependabot (#5850)
+- Bump @aws-sdk/client-sts from 3.577.0 to 3.582.0 @dependabot (#5848)
+
+v2.10.8
+
+- Use latest splunk image on the hdf converters tests workflow @Amndeep7 (#5835)
+- Updated Heroku PostgreSQL @georgedias (#5804)
+
+## Dependency Updates
+
+- Bump tsx from 4.10.4 to 4.10.5 @dependabot (#5839)
+- Bump ts-jest from 29.1.2 to 29.1.3 @dependabot (#5846)
+- Bump axios from 1.6.8 to 1.7.2 @dependabot (#5845)
+- Bump oauth2-mock-server from 7.1.1 to 7.1.2 @dependabot (#5843)
+- Bump fast-xml-parser from 4.3.6 to 4.4.0 @dependabot (#5840)
+- Bump @types/lodash from 4.17.1 to 4.17.4 @dependabot (#5837)
+- Bump tsx from 4.10.3 to 4.10.4 @dependabot (#5836)
+- Bump @aws-sdk/client-config-service from 3.576.0 to 3.577.0 @dependabot (#5828)
+- Bump core-js from 3.37.0 to 3.37.1 @dependabot (#5823)
+- Bump tsx from 4.10.2 to 4.10.3 @dependabot (#5833)
+- Bump rexml from 3.2.5 to 3.2.8 in /libs/inspecjs @dependabot (#5832)
+- Bump @aws-sdk/client-s3 from 3.576.0 to 3.577.0 @dependabot (#5829)
+- Bump sinon from 17.0.2 to 18.0.0 @dependabot (#5827)
+- Bump @aws-sdk/client-config-service from 3.575.0 to 3.576.0 @dependabot (#5826)
+- Bump @types/node from 20.12.11 to 20.12.12 @dependabot (#5824)
+- Bump @aws-sdk/client-s3 from 3.575.0 to 3.576.0 @dependabot (#5822)
+
+v2.10.7
+
+## Dependency Updates
+
+- Bump rimraf from 5.0.6 to 5.0.7 @dependabot (#5819)
+- Bump apexcharts from 3.49.0 to 3.49.1 @dependabot (#5818)
+- Bump @types/validator from 13.11.9 to 13.11.10 @dependabot (#5815)
+- Bump chai-as-promised from 7.1.1 to 7.1.2 @dependabot (#5820)
+- Bump @aws-sdk/client-s3 from 3.574.0 to 3.575.0 @dependabot (#5812)
+- Bump tsx from 4.9.3 to 4.10.2 @dependabot (#5813)
+- Bump @aws-sdk/client-config-service from 3.574.0 to 3.575.0 @dependabot (#5817)
+- Bump csv-stringify from 6.4.6 to 6.5.0 @dependabot (#5814)
+- Bump lerna from 8.1.2 to 8.1.3 @dependabot (#5811)
+- Bump @aws-sdk/client-config-service from 3.572.0 to 3.574.0 @dependabot (#5806)
+- Bump rimraf from 5.0.5 to 5.0.6 @dependabot (#5807)
+- Bump @aws-sdk/client-s3 from 3.572.0 to 3.574.0 @dependabot (#5809)
+- Bump @smithy/node-http-handler from 2.5.0 to 3.0.0 @dependabot (#5805)
+- Bump semver from 7.6.1 to 7.6.2 @dependabot (#5803)
+- Bump eslint-plugin-vue from 9.25.0 to 9.26.0 @dependabot (#5802)
+- Bump @aws-sdk/client-config-service from 3.569.0 to 3.572.0 @dependabot (#5799)
+- Bump @types/node from 20.12.10 to 20.12.11 @dependabot (#5800)
+- Bump @aws-sdk/client-s3 from 3.569.0 to 3.572.0 @dependabot (#5801)
+- Bump cypress from 13.8.1 to 13.9.0 @dependabot (#5797)
+- Bump semver from 7.6.0 to 7.6.1 @dependabot (#5795)
+- Bump sinon from 17.0.1 to 17.0.2 @dependabot (#5796)
+- Bump dotenv-cli from 7.4.1 to 7.4.2 @dependabot (#5794)
+- Bump @types/lodash from 4.17.0 to 4.17.1 @dependabot (#5787)
+- Bump @types/diff from 5.2.0 to 5.2.1 @dependabot (#5791)
+- Bump eslint-plugin-cypress from 3.1.1 to 3.2.0 @dependabot (#5790)
+- Bump @aws-sdk/client-s3 from 3.568.0 to 3.569.0 @dependabot (#5783)
+- Bump @types/prismjs from 1.26.3 to 1.26.4 @dependabot (#5788)
+- Bump tsx from 4.8.2 to 4.9.3 @dependabot (#5792)
+- Bump @types/node from 20.12.8 to 20.12.10 @dependabot (#5789)
+- Bump @aws-sdk/client-config-service from 3.568.0 to 3.569.0 @dependabot (#5782)
+- Bump eslint-plugin-cypress from 3.0.3 to 3.1.1 @dependabot (#5781)
+- Bump tsx from 4.7.3 to 4.8.2 @dependabot (#5775)
+- Bump @aws-sdk/client-config-service from 3.567.0 to 3.568.0 @dependabot (#5780)
+- Bump @aws-sdk/client-sts from 3.567.0 to 3.568.0 @dependabot (#5779)
+- Bump @aws-sdk/client-s3 from 3.567.0 to 3.568.0 @dependabot (#5778)
+- Bump @aws-sdk/client-config-service from 3.564.0 to 3.567.0 @dependabot (#5773)
+- Bump @aws-sdk/client-s3 from 3.565.0 to 3.567.0 @dependabot (#5774)
+- Bump @types/node from 20.12.7 to 20.12.8 @dependabot (#5776)
+- Bump eslint-plugin-cypress from 3.0.2 to 3.0.3 @dependabot (#5772)
+- Bump ejs from 3.1.9 to 3.1.10 @dependabot (#5777)
+- Bump @aws-sdk/client-sts from 3.565.0 to 3.567.0 @dependabot (#5771)
+- Bump lru-cache from 10.2.1 to 10.2.2 @dependabot (#5769)
+- Bump @aws-sdk/client-sts from 3.556.0 to 3.565.0 @dependabot (#5765)
+- Bump eslint-plugin-cypress from 3.0.0 to 3.0.2 @dependabot (#5762)
+- Bump yaml from 2.4.1 to 2.4.2 @dependabot (#5764)
+- Bump @aws-sdk/client-s3 from 3.564.0 to 3.565.0 @dependabot (#5766)
+- Bump @aws-sdk/client-config-service from 3.563.0 to 3.564.0 @dependabot (#5763)
+- Bump tsx from 4.7.2 to 4.7.3 @dependabot (#5756)
+- Bump @aws-sdk/client-s3 from 3.563.0 to 3.564.0 @dependabot (#5761)
+- Bump @aws-sdk/client-config-service from 3.556.0 to 3.563.0 @dependabot (#5759)
+- Bump lru-cache from 10.2.0 to 10.2.1 @dependabot (#5758)
+- Bump @aws-sdk/client-s3 from 3.556.0 to 3.563.0 @dependabot (#5757)
+- Bump cypress from 13.8.0 to 13.8.1 @dependabot (#5751)
+- Bump supertest from 6.3.4 to 7.0.0 @dependabot (#5752)
+- Bump eslint-plugin-cypress from 2.15.2 to 3.0.0 @dependabot (#5750)
+
+
+v2.10.6
+
+## Dependency Updates
+
+- Bump apexcharts from 3.48.0 to 3.49.0 @dependabot (#5748)
+- Bump @nestjs/common from 10.3.7 to 10.3.8 @dependabot (#5743)
+- Bump @nestjs/platform-express from 10.3.7 to 10.3.8 @dependabot (#5744)
+- Bump @nestjs/core from 10.3.7 to 10.3.8 @dependabot (#5745)
+- Bump @nestjs/testing from 10.3.7 to 10.3.8 @dependabot (#5747)
+- Bump @types/diff from 5.0.9 to 5.2.0 @dependabot (#5742)
+- Bump cypress from 13.7.3 to 13.8.0 @dependabot (#5741)
+
 v2.10.5
 
 Package.json Fix @DMedina6 (#5727)

README.md

@@ -366,7 +366,7 @@ If you would like to change Heimdall to your needs, you can use Heimdall's 'Deve
      git clone https://github.com/mitre/heimdall2
      ```
 
-3. Run the PostgreSQL server:
+3. Setup the PostgreSQL server:
 
    Ubuntu:
 
@@ -436,17 +436,17 @@ If you would like to change Heimdall to your needs, you can use Heimdall's 'Deve
 
    - ```bash
      cd heimdall2
-     yarn install      # you may need to run yarn install --registry https://registry.npmjs.org
+     yarn install  # you may need to run yarn install --registry https://registry.npmjs.org
      ```
 
-5. Edit your apps/backend/.env file using the provided `setup-dev-env.sh or setup-dev-env.bat` script. Make sure to set a DATABASE_USERNAME and DATABASE_PASSWORD that match what you set for the PostgresDB in step 3.
+5. Edit or generate the database environment configuration file (apps/backend/.env) using the provided `setup-dev-env.sh or setup-dev-env.bat` script. Make sure to set the DATABASE_USERNAME and DATABASE_PASSWORD variables with values used in step 3.
 
-You can also open the apps/backend/.env file in a text editor and set additional optional configuration values. For more info on configuration values see [Environment Variables Configuration](https://github.com/mitre/heimdall2/wiki/Environment-Variables-Configuration).
+You can also edit, if exists, the apps/backend/.env file using a text editor and set additional optional configuration values. For more info on configuration values see [Environment Variables Configuration](https://github.com/mitre/heimdall2/wiki/Environment-Variables-Configuration).
 
 > [!NOTE]
-> The .env file in the root repository is for the Docker deployment of the Heimdall application. Running a local build will use the .env file in the `apps/backend` directory.
+> The .env file in the root repository is for the Docker deployment of the Heimdall application. Running a local build will use the .env file in the `apps/backend` directory for the database configurations.
 
-6. Create the database:
+6. Create and seed the database:
 
    - ```bash
      # Windows

VERSION

@@ -1 +1 @@
-v2.10.5
+v2.10.10

app.json

@@ -1,7 +1,7 @@
 {
   "environments": {
     "review": {
-      "addons": ["heroku-postgresql:mini"]
+      "addons": ["heroku-postgresql:essential-0"]
     }
   }
 }

apps/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "heimdall-server",
-  "version": "2.10.5",
+  "version": "2.10.10",
   "description": "",
   "license": "Apache-2.0",
   "author": "",
@@ -15,7 +15,7 @@
     "build": "nest build",
     "lint": "eslint \"{src,migrations,seeders,test}/**/*.ts\" --fix",
     "lint:ci": "eslint \"{src,migrations,seeders,test}/**/*.ts\" --max-warnings 0",
-    "sequelize-cli-windows": "node --experimental-loader ts-node/esm node_modules/sequelize-cli/lib/sequelize",
+    "sequelize-cli-windows": "tsx node_modules/sequelize-cli/lib/sequelize",
     "sequelize-cli": "tsx node_modules/.bin/sequelize",
     "start": "node dist/src/main",
     "start:debug": "nest start --debug --watch",
@@ -71,7 +71,7 @@
     "@types/sequelize": "^4.28.9",
     "@types/supertest": "^6.0.1",
     "@types/triple-beam": "^1.3.2",
-    "@types/uuid": "^9.0.0",
+    "@types/uuid": "^10.0.0",
     "@types/validator": "^13.0.0",
     "axios": "^1.4.0",
     "bcryptjs": "^2.4.3",
@@ -107,7 +107,7 @@
     "sequelize-typescript": "^2.0.0",
     "ts-loader": "^9.1.0",
     "tsx": "^4.7.1",
-    "uuid": "^9.0.0",
+    "uuid": "^10.0.0",
     "winston": "^3.3.3"
   },
   "devDependencies": {
@@ -116,7 +116,7 @@
     "@types/mock-fs": "^4.10.0",
     "jest": "^29.0.0",
     "mock-fs": "^5.0.0",
-    "supertest": "^6.0.0",
+    "supertest": "^7.0.0",
     "ts-jest": "^29.1.0"
   }
 }

apps/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mitre/heimdall-lite",
-  "version": "2.10.5",
+  "version": "2.10.10",
   "description": "Heimdall-Lite 2 is a JavaScript based security results viewer and review tool supporting multiple security results formats, such as: InSpec, SonarQube, OWASP-Zap and Fortify which you can load locally or from S3 and other data sources.",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "@types/prismjs": "^1.16.1",
     "@types/sanitize-html": "^2.3.1",
     "@types/triple-beam": "^1.3.2",
-    "@types/uuid": "^9.0.0",
+    "@types/uuid": "^10.0.0",
     "@types/vuelidate": "^0.7.13",
     "@types/xml-js": "^1.0.0",
     "@vue/cli": "^5.0.8",
@@ -76,7 +76,7 @@
     "file-saver": "^2.0.2",
     "highlight.js": "^11.0.0",
     "html-loader": "^5.0.0",
-    "inspecjs": "^2.10.2",
+    "inspecjs": "^2.10.8",
     "lodash": "4.17.21",
     "lru-cache": "^10.1.0",
     "luxon": "^3.0.1",
@@ -91,7 +91,7 @@
     "search-query-parser": "^1.5.5",
     "search-string": "^3.1.0",
     "semver": "^7.6.0",
-    "uuid": "^9.0.0",
+    "uuid": "^10.0.0",
     "vue": "~2.7.16",
     "vue-apexcharts": "^1.5.1",
     "vue-class-component": "^7.0.2",
@@ -124,7 +124,7 @@
     "chai-as-promised": "^7.1.1",
     "jest": "^27.0.6",
     "jest-useragent-mock": "^0.1.1",
-    "sinon": "^17.0.0",
+    "sinon": "^18.0.0",
     "ts-jest": "^29.1.0",
     "vue-jest": "^3.0.7"
   },