Merge pull request #337 from swrlab/dev/update-1.3.5

Eventhub Update v1.3.5
swrlab · Jun 28, 2022 · 6f103b9 · 6f103b9
2 parents 0bcc112 + 311719d
commit 6f103b9
Show file tree

Hide file tree

Showing 10 changed files with 640 additions and 651 deletions.
diff --git a/.github/workflows/ingest-pull.yml b/.github/workflows/ingest-pull.yml
@@ -26,10 +26,10 @@ jobs:
         STAGES: [dev]
     steps:
     - name: 👀 Checkout Code
-      uses: actions/checkout@v3.0.2
+      uses: actions/checkout@v3
 
     - name: ⛺️ Install Node.js
-      uses: actions/setup-node@v3.2.0
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'
@@ -39,7 +39,7 @@ jobs:
       run: yarn
 
     - name: 🔑 Setup Google Cloud Auth
-      uses: google-github-actions/setup-gcloud@v0.6.0
+      uses: google-github-actions/setup-gcloud@v0
       with:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true
@@ -61,10 +61,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: 👀 Checkout Code
-      uses: actions/checkout@v3.0.2
+      uses: actions/checkout@v3
 
     - name: ⛺️ Install Node.js
-      uses: actions/setup-node@v3.2.0
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'

diff --git a/.github/workflows/ingest-push.yml b/.github/workflows/ingest-push.yml
@@ -31,10 +31,10 @@ jobs:
         STAGES: [dev]
     steps:
     - name: 👀 Checkout Code
-      uses: actions/checkout@v3.0.2
+      uses: actions/checkout@v3
 
     - name: ⛺️ Install Node.js
-      uses: actions/setup-node@v3.2.0
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'
@@ -44,7 +44,7 @@ jobs:
       run: yarn
 
     - name: 🔑 Setup Google Cloud Auth
-      uses: google-github-actions/setup-gcloud@v0.6.0
+      uses: google-github-actions/setup-gcloud@v0
       with:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true
@@ -69,10 +69,10 @@ jobs:
       VERSION: ${{ steps.push.outputs.VERSION }}
     steps:
     - name: 👀 Checkout Code
-      uses: actions/checkout@v3.0.2
+      uses: actions/checkout@v3
 
     - name: 🔑 Setup Google Cloud Auth
-      uses: google-github-actions/setup-gcloud@v0.6.0
+      uses: google-github-actions/setup-gcloud@v0
       with:
         service_account_key: ${{ secrets.GCP_GITHUB_SERVICE_ACCOUNT_KEY }}
         export_default_credentials: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.5] - 2022-06-21
+
+- security:
+  - fix `CVE-2022-24434`
+  - fix `CVE-2022-32210`
+  - fix `CVE-2022-33987`
+- update:
+  - github-actions to use latest versions
+  - @google-cloud/secret-manager to `v4.0.0`
+  - @google-cloud/datastore to `v7.0.0`
+  - firebase-admin to `v11.0.0`
+- use node-crc from `@swrlab/utils`
+
 ## [1.3.4] - 2022-06-07
 
 - security: fix `CVE-2022-25878`

diff --git a/Dockerfile b/Dockerfile
@@ -4,12 +4,6 @@ FROM node:16.15-alpine
 # Add python
 RUN apk add g++ make python3
 
-# Add rustup toolchain
-RUN apk add rustup build-base
-RUN rustup-init -y
-ENV PATH "/root/.cargo/bin:$PATH"
-ENV RUSTFLAGS="-C target-feature=-crt-static"
-
 # Create app directory
 WORKDIR /web/app
 

diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ This source code is provided under EUPL v1.2, except for the [`spdx-exceptions`]
 
 | Type    | Name                           | License                                                                                            |
 | ------- | ------------------------------ | -------------------------------------------------------------------------------------------------- |
-| Docker  | `node:16.14.2-alpine`          | [MIT](https://github.com/nodejs/node/blob/master/LICENSE)                                          |
+| Docker  | `node:16.15-alpine`            | [MIT](https://github.com/nodejs/node/blob/master/LICENSE)                                          |
 | NPM     | `@google-cloud/datastore`      | [Apache License 2.0](https://github.com/googleapis/nodejs-datastore/blob/master/LICENSE)           |
 | NPM     | `@google-cloud/pubsub`         | [Apache License 2.0](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE)              |
 | NPM     | `@google-cloud/secret-manager` | [Apache License 2.0](https://github.com/googleapis/nodejs-secret-manager/blob/master/LICENSE)      |
@@ -83,7 +83,6 @@ This source code is provided under EUPL v1.2, except for the [`spdx-exceptions`]
 | NPM     | `google-auth-library`          | [Apache License 2.0](https://github.com/googleapis/google-auth-library-nodejs/blob/master/LICENSE) |
 | NPM     | `jsonwebtoken`                 | [MIT](https://github.com/auth0/node-jsonwebtoken/blob/master/LICENSE)                              |
 | NPM     | `moment`                       | [MIT](https://github.com/moment/moment/blob/develop/LICENSE)                                       |
-| NPM     | `node-crc`                     | [MIT](https://github.com/magiclen/node-crc/blob/master/LICENSE)                                    |
 | NPM     | `slug`                         | [MIT](https://github.com/Trott/slug/blob/master/LICENSE)                                           |
 | NPM     | `swagger-ui-express`           | [MIT](https://github.com/scottie1984/swagger-ui-express/blob/master/LICENSE)                       |
 | NPM     | `uuid`                         | [MIT](https://github.com/uuidjs/uuid/blob/master/LICENSE.md)                                       |

diff --git a/openapi.json b/openapi.json
@@ -11,7 +11,7 @@
       "name": "European Union Public License 1.2",
       "url": "https://spdx.org/licenses/EUPL-1.2.html"
     },
-    "version": "1.3.4"
+    "version": "1.3.5"
   },
   "externalDocs": {
     "description": "ARD-Eventhub Documentation",
@@ -1197,8 +1197,8 @@
           },
           "topic": {
             "type": "string",
-            "description": "Name of the topic to subscribe to",
-            "example": "topic-name-to-subscribe-to"
+            "description": "ID of the topic to subscribe to",
+            "example": "topic-id-to-subscribe-to"
           }
         }
       },

diff --git a/openapi.yaml b/openapi.yaml
@@ -10,7 +10,7 @@ info:
   license:
     name: European Union Public License 1.2
     url: 'https://spdx.org/licenses/EUPL-1.2.html'
-  version: 1.3.4
+  version: 1.3.5
 externalDocs:
   description: ARD-Eventhub Documentation
   url: 'https://swrlab.github.io/ard-eventhub/'
@@ -870,8 +870,8 @@ components:
           example: [email protected]
         topic:
           type: string
-          description: Name of the topic to subscribe to
-          example: topic-name-to-subscribe-to
+          description: ID of the topic to subscribe to
+          example: topic-id-to-subscribe-to
 
     subscriptionsList:
       type: array

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ard-eventhub",
-	"version": "1.3.4",
+	"version": "1.3.5",
 	"description": "ARD system to distribute real-time (live) metadata for primarily radio broadcasts.",
 	"main": "./src/ingest/index.js",
 	"engines": {
@@ -24,41 +24,41 @@
 	"author": "SWR Audio Lab <[email protected]>",
 	"license": "EUPL-1.2",
 	"dependencies": {
-		"@google-cloud/datastore": "^6.6.2",
+		"@google-cloud/datastore": "^7.0.0",
 		"@google-cloud/pubsub": "^3.0.1",
-		"@google-cloud/secret-manager": "^3.12.0",
-		"@swrlab/utils": "swrlab/node-utils#1.0.4-beta",
+		"@google-cloud/secret-manager": "^4.0.0",
+		"@swrlab/utils": "swrlab/node-utils#1.0.6-beta",
 		"compression": "^1.7.4",
-		"dd-trace": "^2.8.0",
+		"dd-trace": "^2.10.0",
 		"dotenv": "^16.0.1",
 		"express": "4.18.1",
 		"express-openapi-validator": "^4.13.8",
-		"firebase-admin": "^10.2.0",
-		"google-auth-library": "^8.0.2",
+		"firebase-admin": "^11.0.0",
+		"google-auth-library": "^8.0.3",
 		"jsonwebtoken": "^8.5.1",
 		"moment": "^2.29.3",
-		"node-crc": "^2.0.13",
 		"slug": "^5.3.0",
 		"swagger-ui-express": "^4.4.0",
 		"uuid": "^8.3.2",
-		"winston": "^3.7.2"
+		"winston": "^3.8.0"
 	},
 	"devDependencies": {
 		"@swrlab/eslint-plugin-swr": "^0.1.2",
 		"@swrlab/swr-prettier-config": "^0.1.2",
 		"chai": "^4.3.6",
 		"chai-http": "^4.3.0",
 		"docsify-cli": "^4.4.4",
-		"eslint": "^8.17.0",
+		"eslint": "^8.18.0",
 		"eslint-plugin-chai-friendly": "^0.7.2",
 		"license-compliance": "^1.2.3",
 		"mocha": "^10.0.0",
-		"nodemon": "^2.0.16",
-		"prettier": "^2.6.2",
-		"typescript": "^4.7.3"
+		"nodemon": "^2.0.18",
+		"prettier": "^2.7.1",
+		"typescript": "^4.7.4"
 	},
 	"resolutions": {
 		"ansi-regex": "^5.0.1",
+		"got": "^11.8.5",
 		"strip-ansi": "^6.0.1"
 	},
 	"prettier": "@swrlab/swr-prettier-config"

diff --git a/src/utils/core/createHashedId.js b/src/utils/core/createHashedId.js
@@ -9,8 +9,8 @@
 */
 
 // load node utils
-const crc = require('node-crc')
+const ard = require('@swrlab/utils/packages/ard')
 
 module.exports = (input) => {
-	return crc.crc64(Buffer.from(input, 'utf-8')).toString('hex')
+	return ard.createHashedId(input)
 }