From 0f019848b3144f2e7b2157e60bd9982c61ad69df Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sun, 14 Apr 2024 22:29:28 +0000 Subject: [PATCH 1/4] fix: starskydesktop/package.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-ELECTRON-6579648 - https://snyk.io/vuln/SNYK-JS-LODASHSET-1320032 --- starskydesktop/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/starskydesktop/package.json b/starskydesktop/package.json index f660765490..79b7ccd749 100644 --- a/starskydesktop/package.json +++ b/starskydesktop/package.json @@ -85,7 +85,7 @@ }, "dependencies": { "chokidar": "^3.6.0", - "electron-settings": "^4.0.2", + "electron-settings": "^4.0.3", "react": "^18.2.0", "react-dom": "^18.2.0", "wait-on": "^7.2.0", @@ -99,7 +99,7 @@ "@typescript-eslint/eslint-plugin": "^7.4.0", "@typescript-eslint/parser": "^7.4.0", "cross-env": "^7.0.3", - "electron": "^29.1.6", + "electron": "^29.3.0", "eslint": "^8.57.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^18.0.0", From c67116bda677c257a903cd50b892c1343d057134 Mon Sep 17 00:00:00 2001 From: Dion Date: Tue, 16 Apr 2024 12:49:41 +0200 Subject: [PATCH 2/4] npm install --- starskydesktop/package-lock.json | 78 +++++++------------------------- 1 file changed, 16 insertions(+), 62 deletions(-) diff --git a/starskydesktop/package-lock.json b/starskydesktop/package-lock.json index 2ec9e5e61e..d0779d32b4 100644 --- a/starskydesktop/package-lock.json +++ b/starskydesktop/package-lock.json @@ -9,7 +9,7 @@ "version": "0.6.0", "dependencies": { "chokidar": "^3.6.0", - "electron-settings": "^4.0.2", + "electron-settings": "^4.0.3", "react": "^18.2.0", "react-dom": "^18.2.0", "wait-on": "^7.2.0", @@ -23,7 +23,7 @@ "@typescript-eslint/eslint-plugin": "^7.4.0", "@typescript-eslint/parser": "^7.4.0", "cross-env": "^7.0.3", - "electron": "^29.1.6", + "electron": "^29.3.0", "eslint": "^8.57.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^18.0.0", @@ -5152,9 +5152,9 @@ } }, "node_modules/electron": { - "version": "29.1.6", - "resolved": "https://registry.npmjs.org/electron/-/electron-29.1.6.tgz", - "integrity": "sha512-UIYfpHR9gRBFKHyejHuXUVQ7nNzZRnoPVOHlijkvqR+DSLwgJ2ZcVVt0LNduNeO8PhPkY1+6kHonL52OTC1cOw==", + "version": "29.3.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-29.3.0.tgz", + "integrity": "sha512-ZxFKm0/v48GSoBuO3DdnMlCYXefEUKUHLMsKxyXY4nZGgzbBKpF/X8haZa2paNj23CLfsCKBOtfc2vsEQiOOsA==", "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", @@ -5331,14 +5331,11 @@ } }, "node_modules/electron-settings": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/electron-settings/-/electron-settings-4.0.2.tgz", - "integrity": "sha512-WnUlrnBsO784oXcag0ym+A3ySoIwonz5GhYFsWroMHVzslzmsP+81f/Fof41T9UrRUxuPPKiZPZMwGO+yvWChg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/electron-settings/-/electron-settings-4.0.3.tgz", + "integrity": "sha512-SQzaUoJXg9Nao/KjlI1w0qAsn2xb2QPYYOiF0gSPI8X+fnXOrTmTspEyOONw9O3OVKuog4n8hlPS076vy3QMiA==", "dependencies": { - "lodash.get": "^4.4.2", - "lodash.has": "^4.5.2", - "lodash.set": "^4.3.2", - "lodash.unset": "^4.5.2", + "lodash": "^4.17.21", "mkdirp": "^1.0.4", "write-file-atomic": "^3.0.3" }, @@ -8909,16 +8906,6 @@ "optional": true, "peer": true }, - "node_modules/lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" - }, - "node_modules/lodash.has": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz", - "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g==" - }, "node_modules/lodash.isplainobject": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", @@ -8938,11 +8925,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lodash.set": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", - "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==" - }, "node_modules/lodash.union": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", @@ -8950,11 +8932,6 @@ "optional": true, "peer": true }, - "node_modules/lodash.unset": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/lodash.unset/-/lodash.unset-4.5.2.tgz", - "integrity": "sha512-bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg==" - }, "node_modules/logform": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz", @@ -16404,9 +16381,9 @@ } }, "electron": { - "version": "29.1.6", - "resolved": "https://registry.npmjs.org/electron/-/electron-29.1.6.tgz", - "integrity": "sha512-UIYfpHR9gRBFKHyejHuXUVQ7nNzZRnoPVOHlijkvqR+DSLwgJ2ZcVVt0LNduNeO8PhPkY1+6kHonL52OTC1cOw==", + "version": "29.3.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-29.3.0.tgz", + "integrity": "sha512-ZxFKm0/v48GSoBuO3DdnMlCYXefEUKUHLMsKxyXY4nZGgzbBKpF/X8haZa2paNj23CLfsCKBOtfc2vsEQiOOsA==", "requires": { "@electron/get": "^2.0.0", "@types/node": "^20.9.0", @@ -16551,14 +16528,11 @@ } }, "electron-settings": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/electron-settings/-/electron-settings-4.0.2.tgz", - "integrity": "sha512-WnUlrnBsO784oXcag0ym+A3ySoIwonz5GhYFsWroMHVzslzmsP+81f/Fof41T9UrRUxuPPKiZPZMwGO+yvWChg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/electron-settings/-/electron-settings-4.0.3.tgz", + "integrity": "sha512-SQzaUoJXg9Nao/KjlI1w0qAsn2xb2QPYYOiF0gSPI8X+fnXOrTmTspEyOONw9O3OVKuog4n8hlPS076vy3QMiA==", "requires": { - "lodash.get": "^4.4.2", - "lodash.has": "^4.5.2", - "lodash.set": "^4.3.2", - "lodash.unset": "^4.5.2", + "lodash": "^4.17.21", "mkdirp": "^1.0.4", "write-file-atomic": "^3.0.3" } @@ -19190,16 +19164,6 @@ "optional": true, "peer": true }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" - }, - "lodash.has": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz", - "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g==" - }, "lodash.isplainobject": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", @@ -19219,11 +19183,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "lodash.set": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", - "integrity": "sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==" - }, "lodash.union": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", @@ -19231,11 +19190,6 @@ "optional": true, "peer": true }, - "lodash.unset": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/lodash.unset/-/lodash.unset-4.5.2.tgz", - "integrity": "sha512-bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg==" - }, "logform": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz", From a70bbc92e32c83d20a8e260bcc15c88056253397 Mon Sep 17 00:00:00 2001 From: Dion Date: Tue, 16 Apr 2024 12:55:56 +0200 Subject: [PATCH 3/4] Upgrade NuGet Packages --- starsky/build/_build.csproj | 2 +- .../starsky.feature.health.csproj | 4 ++-- .../starsky.feature.webhtmlpublish.csproj | 4 ++-- .../starsky.foundation.database.csproj | 4 ++-- ...arsky.foundation.thumbnailgeneration.csproj | 4 ++-- .../starsky.foundation.thumbnailmeta.csproj | 2 +- .../starsky.foundation.webtelemetry.csproj | 18 +++++++++--------- starsky/starskytest/starskytest.csproj | 8 ++++---- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/starsky/build/_build.csproj b/starsky/build/_build.csproj index 76731538b0..80dfd2ff5f 100644 --- a/starsky/build/_build.csproj +++ b/starsky/build/_build.csproj @@ -17,7 +17,7 @@ - + diff --git a/starsky/starsky.feature.health/starsky.feature.health.csproj b/starsky/starsky.feature.health/starsky.feature.health.csproj index 58dccc1fb6..7a40a7f3c5 100644 --- a/starsky/starsky.feature.health/starsky.feature.health.csproj +++ b/starsky/starsky.feature.health/starsky.feature.health.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/starsky/starsky.feature.webhtmlpublish/starsky.feature.webhtmlpublish.csproj b/starsky/starsky.feature.webhtmlpublish/starsky.feature.webhtmlpublish.csproj index fb08056686..b733aebd23 100644 --- a/starsky/starsky.feature.webhtmlpublish/starsky.feature.webhtmlpublish.csproj +++ b/starsky/starsky.feature.webhtmlpublish/starsky.feature.webhtmlpublish.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/starsky/starsky.foundation.database/starsky.foundation.database.csproj b/starsky/starsky.foundation.database/starsky.foundation.database.csproj index d6d1799b3b..67a594f88a 100644 --- a/starsky/starsky.foundation.database/starsky.foundation.database.csproj +++ b/starsky/starsky.foundation.database/starsky.foundation.database.csproj @@ -17,11 +17,11 @@ - + - + diff --git a/starsky/starsky.foundation.thumbnailgeneration/starsky.foundation.thumbnailgeneration.csproj b/starsky/starsky.foundation.thumbnailgeneration/starsky.foundation.thumbnailgeneration.csproj index 4def3fc512..e211197428 100644 --- a/starsky/starsky.foundation.thumbnailgeneration/starsky.foundation.thumbnailgeneration.csproj +++ b/starsky/starsky.foundation.thumbnailgeneration/starsky.foundation.thumbnailgeneration.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/starsky/starsky.foundation.thumbnailmeta/starsky.foundation.thumbnailmeta.csproj b/starsky/starsky.foundation.thumbnailmeta/starsky.foundation.thumbnailmeta.csproj index a15bab4bde..8c28e7d3fc 100644 --- a/starsky/starsky.foundation.thumbnailmeta/starsky.foundation.thumbnailmeta.csproj +++ b/starsky/starsky.foundation.thumbnailmeta/starsky.foundation.thumbnailmeta.csproj @@ -18,7 +18,7 @@ - + diff --git a/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj b/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj index 3f5a0d9f9d..9e3fc35626 100644 --- a/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj +++ b/starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj @@ -25,15 +25,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/starsky/starskytest/starskytest.csproj b/starsky/starskytest/starskytest.csproj index 11f800b9cf..f2892c9530 100644 --- a/starsky/starskytest/starskytest.csproj +++ b/starsky/starskytest/starskytest.csproj @@ -22,13 +22,13 @@ - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 4042c53325d66bd89ad04c35563cc425b73b9bc2 Mon Sep 17 00:00:00 2001 From: Dion Date: Tue, 16 Apr 2024 13:02:15 +0200 Subject: [PATCH 4/4] fix build --- .../starsky.foundation.database.csproj | 24 +++++++++---------- starsky/starskytest/starskytest.csproj | 10 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/starsky/starsky.foundation.database/starsky.foundation.database.csproj b/starsky/starsky.foundation.database/starsky.foundation.database.csproj index 67a594f88a..a7924c4a68 100644 --- a/starsky/starsky.foundation.database/starsky.foundation.database.csproj +++ b/starsky/starsky.foundation.database/starsky.foundation.database.csproj @@ -13,15 +13,15 @@ - - - - - - - - - + + + + + + + + + @@ -83,9 +83,9 @@ - - migrations.md - + + migrations.md + diff --git a/starsky/starskytest/starskytest.csproj b/starsky/starskytest/starskytest.csproj index f2892c9530..75e507bbb7 100644 --- a/starsky/starskytest/starskytest.csproj +++ b/starsky/starskytest/starskytest.csproj @@ -21,13 +21,13 @@ - - - - + + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive