From 642c0f2fdf883cd7ccca9a44e2a614b9d3c03063 Mon Sep 17 00:00:00 2001 From: Matej Sychra Date: Fri, 25 Oct 2024 15:29:27 +0200 Subject: [PATCH 01/10] debugging mqtt dns issue: downgraded mqtt client, upgraded docker orb to latest supported, changed internal network from type external to internal --- .circleci/config.yml | 25 +++++++++++++------------ base | 2 +- docker-compose.test.yml | 2 +- package.json | 2 +- services/console | 2 +- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b6b26bd86..5a08bcbfd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: node: circleci/node@6.3.0 - docker: circleci/docker@2.0.3 + docker: circleci/docker@2.7.1 slack: circleci/slack@5.0.0 jobs: @@ -9,7 +9,8 @@ jobs: build-base: executor: docker/docker steps: - - setup_remote_docker + - setup_remote_docker: + version: previous - checkout - docker/check - run: @@ -31,8 +32,8 @@ jobs: build-console-cloud: executor: docker/docker steps: - - setup_remote_docker -# version: 20.10.18 + - setup_remote_docker: + version: previous - checkout - run: name: Fetch all dependencies (esp. console) @@ -73,8 +74,8 @@ jobs: build-console-classic: executor: docker/docker steps: - - setup_remote_docker -# version: 20.10.18 + - setup_remote_docker: + version: previous - checkout - run: name: Fetch all dependencies (esp. console) @@ -109,8 +110,8 @@ jobs: build-api-cloud: executor: docker/docker steps: - - setup_remote_docker -# version: 20.10.18 + - setup_remote_docker: + version: previous - checkout - run: name: Clean package-lock @@ -173,8 +174,8 @@ jobs: chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose docker compose version - - setup_remote_docker -# version: 20.10.18 + - setup_remote_docker: + version: previous - checkout @@ -332,8 +333,8 @@ jobs: sysdig: executor: docker/docker steps: - - setup_remote_docker -# version: 20.10.18 + - setup_remote_docker: + version: previous - checkout - docker/check - run: diff --git a/base b/base index 38e2e232a..11b4db5e9 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 38e2e232a25f20429c400ff499e24b18fb81b794 +Subproject commit 11b4db5e96946aca494d8673e06c1febbbea2b5a diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 17423b4e1..c92ee4bf3 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -3,7 +3,7 @@ networks: nat: external: true internal: - external: false + external: true services: mosquitto: env_file: .env diff --git a/package.json b/package.json index 50f12d1e9..e2cad5c65 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "mkdirp": "^1.0.3", "moment-timezone": "0.5.40", "morgan": "^1.10.0", - "mqtt": "^5.7.2", + "mqtt": "^4.2.6", "nano": "^10.1.4", "nocache": "^4.0.0", "node-forge": "^1.3.0", diff --git a/services/console b/services/console index 35b086547..7f9a81050 160000 --- a/services/console +++ b/services/console @@ -1 +1 @@ -Subproject commit 35b086547cedfa737a0bbd75dbc98663077d86d8 +Subproject commit 7f9a810505f807d203655395af5a5e01b3cbb7ee From de117c32da80ef8c22cc25057f99627913f81e7b Mon Sep 17 00:00:00 2001 From: Matej Sychra Date: Fri, 25 Oct 2024 15:31:17 +0200 Subject: [PATCH 02/10] network external could not be found --- docker-compose.test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index c92ee4bf3..3ff50e848 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,9 +1,9 @@ version: '2.2' networks: nat: - external: true + external: false internal: - external: true + external: false services: mosquitto: env_file: .env From e431878800ef406553ef5416c5ed68f082339fd2 Mon Sep 17 00:00:00 2001 From: Matej Sychra Date: Fri, 25 Oct 2024 15:38:13 +0200 Subject: [PATCH 03/10] after passing the test, debugging issue with buildx in build-console-classic step (and new docker orb) --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a08bcbfd..b0f8569e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,7 +75,7 @@ jobs: executor: docker/docker steps: - setup_remote_docker: - version: previous + version: 20.10.24 - checkout - run: name: Fetch all dependencies (esp. console) From 7f475d167fd9aa3d05894ace0ecadfc6acef1dea Mon Sep 17 00:00:00 2001 From: Matej Sychra Date: Fri, 25 Oct 2024 15:44:08 +0200 Subject: [PATCH 04/10] moved extra_build_args to single line --- .circleci/config.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b0f8569e8..202213a5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,18 +88,7 @@ jobs: docker-context: services/console/src image: thinx/console dockerfile: services/console/src/Dockerfile - extra_build_args: | - --build-arg ROLLBAR_ACCESS_TOKEN=${ROLLBAR_ACCESS_TOKEN} \ - --build-arg LANDING_HOSTNAME=${LANDING_HOSTNAME} \ - --build-arg API_HOSTNAME=${API_HOSTNAME} \ - --build-arg API_BASEURL=${API_BASEURL} \ - --build-arg WEB_HOSTNAME=${WEB_HOSTNAME} \ - --build-arg GOOGLE_ANALYTICS_ID=${GOOGLE_ANALYTICS_ID} \ - --build-arg CRISP_WEBSITE_ID=${CRISP_WEBSITE_ID} \ - --build-arg ENTERPRISE=${ENTERPRISE} \ - --build-arg ENVIRONMENT=${ENVIRONMENT} \ - --build-arg COMMIT_ID=$CIRCLE_SHA1 \ - --build-arg VERSION_CODE=$(echo $CIRCLE_SHA1 | cut -c -7) \ + extra_build_args: '--build-arg ROLLBAR_ACCESS_TOKEN=${ROLLBAR_ACCESS_TOKEN} --build-arg LANDING_HOSTNAME=${LANDING_HOSTNAME} --build-arg API_HOSTNAME=${API_HOSTNAME} --build-arg API_BASEURL=${API_BASEURL} --build-arg WEB_HOSTNAME=${WEB_HOSTNAME} --build-arg GOOGLE_ANALYTICS_ID=${GOOGLE_ANALYTICS_ID} --build-arg CRISP_WEBSITE_ID=${CRISP_WEBSITE_ID} --build-arg ENTERPRISE=${ENTERPRISE} --build-arg ENVIRONMENT=${ENVIRONMENT} --build-arg COMMIT_ID=$CIRCLE_SHA1 --build-arg VERSION_CODE=$(echo $CIRCLE_SHA1 | cut -c -7)' tag: 'swarm' - docker/push: digest-path: /tmp/digest.txt @@ -121,12 +110,7 @@ jobs: - docker/build: image: thinxcloud/api dockerfile: ./Dockerfile - extra_build_args: | - --build-arg AQUA_SEC_TOKEN=${AQUA_SEC_TOKEN} \ - --build-arg SNYK_TOKEN=${SNYK_TOKEN} \ - --build-arg ENVIRONMENT=${ENVIRONMENT} \ - --build-arg REVISION=$(git describe --abbrev=0) \ - --build-arg ENTERPRISE=${ENTERPRISE} \ + extra_build_args: '--build-arg AQUA_SEC_TOKEN=${AQUA_SEC_TOKEN} --build-arg SNYK_TOKEN=${SNYK_TOKEN} --build-arg ENVIRONMENT=${ENVIRONMENT} --build-arg REVISION=$(git describe --abbrev=0) --build-arg ENTERPRISE=${ENTERPRISE}' tag: 'latest' - docker/push: digest-path: /tmp/digest.txt From adedb16b14b5bb357cf57ff196da4a7eb09a3f94 Mon Sep 17 00:00:00 2001 From: Matej Sychra Date: Sat, 26 Oct 2024 21:51:59 +0200 Subject: [PATCH 05/10] reviewed all builders CI pipelines --- base | 2 +- builders/arduino-docker-build | 2 +- builders/micropython-docker-build | 2 +- builders/mongoose-docker-build | 2 +- builders/platformio-docker-build | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base b/base index 11b4db5e9..eafc2afaa 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 11b4db5e96946aca494d8673e06c1febbbea2b5a +Subproject commit eafc2afaa921be84c82128124145b6974574f169 diff --git a/builders/arduino-docker-build b/builders/arduino-docker-build index 8a05944e1..0fde45af8 160000 --- a/builders/arduino-docker-build +++ b/builders/arduino-docker-build @@ -1 +1 @@ -Subproject commit 8a05944e1d3d2182246f0f46540b112ee917adde +Subproject commit 0fde45af8e41e051b03fb340dc0ed0fabe46e268 diff --git a/builders/micropython-docker-build b/builders/micropython-docker-build index 976a3c05d..2e2983cb2 160000 --- a/builders/micropython-docker-build +++ b/builders/micropython-docker-build @@ -1 +1 @@ -Subproject commit 976a3c05d5820f90016b7dd91a9c36c0027570a4 +Subproject commit 2e2983cb2f91c8be624e52ba2423ba4afec0f401 diff --git a/builders/mongoose-docker-build b/builders/mongoose-docker-build index ae3853ef2..86d4f36e2 160000 --- a/builders/mongoose-docker-build +++ b/builders/mongoose-docker-build @@ -1 +1 @@ -Subproject commit ae3853ef2bde2b40c24cd43eb913d57353044e25 +Subproject commit 86d4f36e208170ba82c7b8d5c1a4ce0bbad1732f diff --git a/builders/platformio-docker-build b/builders/platformio-docker-build index aa2da9635..2d28d9090 160000 --- a/builders/platformio-docker-build +++ b/builders/platformio-docker-build @@ -1 +1 @@ -Subproject commit aa2da9635dcaddd55e7d809c1a7111746924e4a9 +Subproject commit 2d28d9090dc749d27a04ffd5d6cdcdad29c71c3b From 8d88379fdb3ca79ce505088efe9fa1c664400d04 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 30 Oct 2024 07:07:48 +0000 Subject: [PATCH 06/10] fix: upgrade yaml from 2.2.2 to 2.6.0 Snyk has created this PR to upgrade yaml from 2.2.2 to 2.6.0. See this package in npm: yaml See this project in Snyk: https://app.snyk.io/org/suculent/project/ecd536cf-5cd8-456a-9632-baaf13c7dd47?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 11 +++++++---- package.json | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58beb7684..3090ed98d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -71,7 +71,7 @@ "utf-8": "^2.0.0", "uuid": "^8.3.2", "ws": "^8.14.2", - "yaml": "2.2.2" + "yaml": "^2.6.0" }, "devDependencies": { "assert": "^2.0.0", @@ -10601,10 +10601,13 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz", - "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz", + "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==", "license": "ISC", + "bin": { + "yaml": "bin.mjs" + }, "engines": { "node": ">= 14" } diff --git a/package.json b/package.json index 50f12d1e9..8a4858d2f 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "utf-8": "^2.0.0", "uuid": "^8.3.2", "ws": "^8.14.2", - "yaml": "2.2.2" + "yaml": "2.6.0" }, "overrides": { "async": "2.6.4", From 836a31e7192cdf25e7d09838ffccf2d836cfdc42 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 30 Oct 2024 07:07:53 +0000 Subject: [PATCH 07/10] fix: upgrade qs from 6.10.3 to 6.13.0 Snyk has created this PR to upgrade qs from 6.10.3 to 6.13.0. See this package in npm: qs See this project in Snyk: https://app.snyk.io/org/suculent/project/ecd536cf-5cd8-456a-9632-baaf13c7dd47?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 100 +++------------------------------------------- package.json | 2 +- 2 files changed, 6 insertions(+), 96 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58beb7684..3295055c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "node-schedule": "^1.3.2", "npm-auto-version": "^1.0.0", "path": "^0.12.7", - "qs": "6.10.3", + "qs": "^6.13.0", "querystring": "^0.2.0", "redis": "^4.6.1", "rollbar": "^2.25.2", @@ -1998,21 +1998,6 @@ "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/body-parser/node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -2240,21 +2225,6 @@ "node": ">=10" } }, - "node_modules/chai-http/node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/chalk": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", @@ -4091,21 +4061,6 @@ ], "license": "MIT" }, - "node_modules/express/node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/express/node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -4495,21 +4450,6 @@ "url": "https://ko-fi.com/tunnckoCore/commissions" } }, - "node_modules/formidable/node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -7488,21 +7428,6 @@ "node": ">=14" } }, - "node_modules/nano/node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -8612,12 +8537,12 @@ } }, "node_modules/qs": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", - "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -9813,21 +9738,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, - "node_modules/superagent/node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "license": "BSD-3-Clause", - "dependencies": { - "side-channel": "^1.0.6" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", diff --git a/package.json b/package.json index 50f12d1e9..9d12e40ce 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "node-schedule": "^1.3.2", "npm-auto-version": "^1.0.0", "path": "^0.12.7", - "qs": "6.10.3", + "qs": "6.13.0", "querystring": "^0.2.0", "redis": "^4.6.1", "rollbar": "^2.25.2", From dba0ab455e0ca7635ff346a2750bfb7a0c714bac Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 30 Oct 2024 07:08:00 +0000 Subject: [PATCH 08/10] fix: upgrade moment-timezone from 0.5.40 to 0.5.46 Snyk has created this PR to upgrade moment-timezone from 0.5.40 to 0.5.46. See this package in npm: moment-timezone See this project in Snyk: https://app.snyk.io/org/suculent/project/ecd536cf-5cd8-456a-9632-baaf13c7dd47?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58beb7684..443a80498 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "md5": "^2.3.0", "mime": "^3.0.0", "mkdirp": "^1.0.3", - "moment-timezone": "0.5.40", + "moment-timezone": "^0.5.46", "morgan": "^1.10.0", "mqtt": "^5.7.2", "nano": "^10.1.4", @@ -7331,12 +7331,12 @@ } }, "node_modules/moment-timezone": { - "version": "0.5.40", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.40.tgz", - "integrity": "sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg==", + "version": "0.5.46", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz", + "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==", "license": "MIT", "dependencies": { - "moment": ">= 2.9.0" + "moment": "^2.29.4" }, "engines": { "node": "*" diff --git a/package.json b/package.json index 50f12d1e9..953685a4c 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "md5": "^2.3.0", "mime": "^3.0.0", "mkdirp": "^1.0.3", - "moment-timezone": "0.5.40", + "moment-timezone": "0.5.46", "morgan": "^1.10.0", "mqtt": "^5.7.2", "nano": "^10.1.4", From 35ec4363f3c83d8bc39bc81b5d1be088dd022426 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 30 Oct 2024 07:08:04 +0000 Subject: [PATCH 09/10] fix: upgrade semver from 7.5.3 to 7.6.3 Snyk has created this PR to upgrade semver from 7.5.3 to 7.6.3. See this package in npm: semver See this project in Snyk: https://app.snyk.io/org/suculent/project/ecd536cf-5cd8-456a-9632-baaf13c7dd47?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 35 ++++------------------------------- package.json | 2 +- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58beb7684..ef7db14bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,7 +55,7 @@ "querystring": "^0.2.0", "redis": "^4.6.1", "rollbar": "^2.25.2", - "semver": "7.5.3", + "semver": "^7.6.3", "sha256": "^0.2.0", "shell-escape": "^0.2.0", "sillyname": "^0.1.0", @@ -6521,18 +6521,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, - "node_modules/jsonwebtoken/node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/jsprim": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", @@ -9014,13 +9002,10 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "license": "ISC", - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, @@ -9028,18 +9013,6 @@ "node": ">=10" } }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "license": "ISC", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/send": { "version": "0.19.0", "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", diff --git a/package.json b/package.json index 50f12d1e9..98443248b 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "querystring": "^0.2.0", "redis": "^4.6.1", "rollbar": "^2.25.2", - "semver": "7.5.3", + "semver": "7.6.3", "sha256": "^0.2.0", "shell-escape": "^0.2.0", "sillyname": "^0.1.0", From a0a2834315ea8f1247aa7876f722edd04ad69a62 Mon Sep 17 00:00:00 2001 From: Matej Sychra Date: Wed, 6 Nov 2024 15:50:19 +0100 Subject: [PATCH 10/10] GDPR notification scheduler fix --- lib/thinx/gdpr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/thinx/gdpr.js b/lib/thinx/gdpr.js index 5342364b7..a7a29e213 100644 --- a/lib/thinx/gdpr.js +++ b/lib/thinx/gdpr.js @@ -70,7 +70,7 @@ module.exports = class GDPR { var d = new Date(); d.setMonth(d.getMonth() - month); d.setDate(d.getDay() - day); - return d; + return Math.floor(d.valueOf() / 1000); } notify24(user, _opt_callback) {