From 2f69fd5e0e8e85548c18778bbf2d4af0c6cf4c32 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Mon, 30 Sep 2024 09:52:51 +0200 Subject: [PATCH 1/2] upgrade to fix security warnings --- package-lock.json | 279 +++++----------------------------------------- 1 file changed, 30 insertions(+), 249 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0d59932..3a2711d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2172,10 +2172,11 @@ "dev": true }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true, + "license": "MIT" }, "node_modules/@types/json-schema": { "version": "7.0.15", @@ -4079,13 +4080,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", - "dev": true, - "license": "MIT" - }, "node_modules/eslint/node_modules/eslint-scope": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz", @@ -7153,10 +7147,11 @@ } }, "node_modules/rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "dev": true, + "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -8456,214 +8451,6 @@ "node": ">=12" } }, - "node_modules/vite-node/node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.0.tgz", - "integrity": "sha512-WTWD8PfoSAJ+qL87lE7votj3syLavxunWhzCnx3XFxFiI/BA/r3X7MUM8dVrH8rb2r4AiO8jJsr3ZjdaftmnfA==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-android-arm64": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.0.tgz", - "integrity": "sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz", - "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-darwin-x64": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.0.tgz", - "integrity": "sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.0.tgz", - "integrity": "sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.0.tgz", - "integrity": "sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.0.tgz", - "integrity": "sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.0.tgz", - "integrity": "sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.0.tgz", - "integrity": "sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.0.tgz", - "integrity": "sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.0.tgz", - "integrity": "sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz", - "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.0.tgz", - "integrity": "sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.0.tgz", - "integrity": "sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.0.tgz", - "integrity": "sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/vite-node/node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz", - "integrity": "sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/vite-node/node_modules/esbuild": { "version": "0.21.5", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", @@ -8703,12 +8490,13 @@ } }, "node_modules/vite-node/node_modules/rollup": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz", - "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==", + "version": "4.22.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.5.tgz", + "integrity": "sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==", "dev": true, + "license": "MIT", "dependencies": { - "@types/estree": "1.0.5" + "@types/estree": "1.0.6" }, "bin": { "rollup": "dist/bin/rollup" @@ -8718,22 +8506,22 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.21.0", - "@rollup/rollup-android-arm64": "4.21.0", - "@rollup/rollup-darwin-arm64": "4.21.0", - "@rollup/rollup-darwin-x64": "4.21.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.21.0", - "@rollup/rollup-linux-arm-musleabihf": "4.21.0", - "@rollup/rollup-linux-arm64-gnu": "4.21.0", - "@rollup/rollup-linux-arm64-musl": "4.21.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0", - "@rollup/rollup-linux-riscv64-gnu": "4.21.0", - "@rollup/rollup-linux-s390x-gnu": "4.21.0", - "@rollup/rollup-linux-x64-gnu": "4.21.0", - "@rollup/rollup-linux-x64-musl": "4.21.0", - "@rollup/rollup-win32-arm64-msvc": "4.21.0", - "@rollup/rollup-win32-ia32-msvc": "4.21.0", - "@rollup/rollup-win32-x64-msvc": "4.21.0", + "@rollup/rollup-android-arm-eabi": "4.22.5", + "@rollup/rollup-android-arm64": "4.22.5", + "@rollup/rollup-darwin-arm64": "4.22.5", + "@rollup/rollup-darwin-x64": "4.22.5", + "@rollup/rollup-linux-arm-gnueabihf": "4.22.5", + "@rollup/rollup-linux-arm-musleabihf": "4.22.5", + "@rollup/rollup-linux-arm64-gnu": "4.22.5", + "@rollup/rollup-linux-arm64-musl": "4.22.5", + "@rollup/rollup-linux-powerpc64le-gnu": "4.22.5", + "@rollup/rollup-linux-riscv64-gnu": "4.22.5", + "@rollup/rollup-linux-s390x-gnu": "4.22.5", + "@rollup/rollup-linux-x64-gnu": "4.22.5", + "@rollup/rollup-linux-x64-musl": "4.22.5", + "@rollup/rollup-win32-arm64-msvc": "4.22.5", + "@rollup/rollup-win32-ia32-msvc": "4.22.5", + "@rollup/rollup-win32-x64-msvc": "4.22.5", "fsevents": "~2.3.2" } }, @@ -9252,13 +9040,6 @@ "node": ">=12" } }, - "node_modules/vitest/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", - "dev": true, - "license": "MIT" - }, "node_modules/vitest/node_modules/acorn-walk": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", From 40afcf4c9b0390b0f1d70f98a7d5360ef14b6eff Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Mon, 30 Sep 2024 09:54:03 +0200 Subject: [PATCH 2/2] include mixin in proxy components --- .../backup_clouds/BackupCloudConfigMixin.vue | 2 +- .../backup_clouds/OpenwbBackupCloudProxy.vue | 16 ++-------------- .../backup_clouds/onedrive/backup_cloud.vue | 2 +- .../charge_points/OpenwbChargePointProxy.vue | 11 ++--------- src/components/devices/OpenwbConfigProxy.vue | 19 ++----------------- .../OpenwbDisplayThemeProxy.vue | 11 ++--------- .../OpenwbElectricityTariffProxy.vue | 11 ++--------- .../OpenwbRippleControlReceiverProxy.vue | 17 ++--------------- .../vehicles/OpenwbVehicleProxy.vue | 12 ++---------- .../web_themes/OpenwbWebThemeProxy.vue | 11 ++--------- 10 files changed, 18 insertions(+), 94 deletions(-) diff --git a/src/components/backup_clouds/BackupCloudConfigMixin.vue b/src/components/backup_clouds/BackupCloudConfigMixin.vue index 8d8bb824..132eac83 100644 --- a/src/components/backup_clouds/BackupCloudConfigMixin.vue +++ b/src/components/backup_clouds/BackupCloudConfigMixin.vue @@ -8,7 +8,7 @@ export default { updateConfiguration(event, path = undefined) { this.$emit("update:configuration", { value: event, object: path }); }, - sendSystemCommand(command, data = {}) { + sendCommand(command, data = {}) { this.$emit("sendCommand", { command: command, data: data, diff --git a/src/components/backup_clouds/OpenwbBackupCloudProxy.vue b/src/components/backup_clouds/OpenwbBackupCloudProxy.vue index 65832a64..d636ecee 100644 --- a/src/components/backup_clouds/OpenwbBackupCloudProxy.vue +++ b/src/components/backup_clouds/OpenwbBackupCloudProxy.vue @@ -12,14 +12,12 @@ diff --git a/src/components/backup_clouds/onedrive/backup_cloud.vue b/src/components/backup_clouds/onedrive/backup_cloud.vue index 8107c359..39e7debf 100644 --- a/src/components/backup_clouds/onedrive/backup_cloud.vue +++ b/src/components/backup_clouds/onedrive/backup_cloud.vue @@ -77,7 +77,7 @@ title="4. Token abrufen und speichern" button-text="Autorisierungs-Token abrufen" subtype="success" - @button-clicked="sendSystemCommand('retrieveMSALTokens', {})" + @button-clicked="sendCommand('retrieveMSALTokens', {})" > diff --git a/src/components/display_themes/OpenwbDisplayThemeProxy.vue b/src/components/display_themes/OpenwbDisplayThemeProxy.vue index fe966a03..1ffffbb9 100644 --- a/src/components/display_themes/OpenwbDisplayThemeProxy.vue +++ b/src/components/display_themes/OpenwbDisplayThemeProxy.vue @@ -42,6 +42,7 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; library.add(fasPeopleGroup, fasCertificate); import { defineAsyncComponent } from "vue"; +import DisplayThemeConfigMixin from "./DisplayThemeConfigMixin.vue"; import OpenwbDisplayThemeFallback from "./OpenwbDisplayThemeFallback.vue"; export default { @@ -49,10 +50,7 @@ export default { components: { FontAwesomeIcon, }, - props: { - displayTheme: { type: Object, required: true }, - }, - emits: ["update:configuration"], + mixins: [DisplayThemeConfigMixin], computed: { myComponent() { console.debug(`loading display theme: ${this.displayTheme.type}`); @@ -63,10 +61,5 @@ export default { }); }, }, - methods: { - updateConfiguration(event) { - this.$emit("update:configuration", event); - }, - }, }; diff --git a/src/components/electricity_tariffs/OpenwbElectricityTariffProxy.vue b/src/components/electricity_tariffs/OpenwbElectricityTariffProxy.vue index 8f7a2ec9..d3488a2a 100644 --- a/src/components/electricity_tariffs/OpenwbElectricityTariffProxy.vue +++ b/src/components/electricity_tariffs/OpenwbElectricityTariffProxy.vue @@ -11,14 +11,12 @@ diff --git a/src/components/ripple_control_receivers/OpenwbRippleControlReceiverProxy.vue b/src/components/ripple_control_receivers/OpenwbRippleControlReceiverProxy.vue index e68b22e8..546da700 100644 --- a/src/components/ripple_control_receivers/OpenwbRippleControlReceiverProxy.vue +++ b/src/components/ripple_control_receivers/OpenwbRippleControlReceiverProxy.vue @@ -6,20 +6,17 @@ :is="myComponent" :ripple-control-receiver="rippleControlReceiver" @update:configuration="updateConfiguration($event)" - @send-command="sendCommand($event)" /> diff --git a/src/components/vehicles/OpenwbVehicleProxy.vue b/src/components/vehicles/OpenwbVehicleProxy.vue index 46a18892..0a2946ee 100644 --- a/src/components/vehicles/OpenwbVehicleProxy.vue +++ b/src/components/vehicles/OpenwbVehicleProxy.vue @@ -12,15 +12,12 @@ diff --git a/src/components/web_themes/OpenwbWebThemeProxy.vue b/src/components/web_themes/OpenwbWebThemeProxy.vue index 990fbb77..f128d74c 100644 --- a/src/components/web_themes/OpenwbWebThemeProxy.vue +++ b/src/components/web_themes/OpenwbWebThemeProxy.vue @@ -42,6 +42,7 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; library.add(fasPeopleGroup, fasCertificate); import { defineAsyncComponent } from "vue"; +import WebThemeConfigMixin from "./WebThemeConfigMixin.vue"; import OpenwbWebThemeFallback from "./OpenwbWebThemeFallback.vue"; export default { @@ -49,10 +50,7 @@ export default { components: { FontAwesomeIcon, }, - props: { - webTheme: { type: Object, required: true }, - }, - emits: ["update:configuration"], + mixins: [WebThemeConfigMixin], computed: { myComponent() { console.debug(`loading web theme: ${this.webTheme.name}`); @@ -62,10 +60,5 @@ export default { }); }, }, - methods: { - updateConfiguration(event) { - this.$emit("update:configuration", event); - }, - }, };