[green] Eliminate website dependency advisories

Signed-off-by: Viwat Vchirawongkwin <viwat.v@chula.ac.th>

Author: yyods

tools/web/package-lock.json

@@ -14,6 +14,8 @@
     "build:sites": "node scripts/assert-no-local-firmware-preview.js && vinext build && node scripts/prepare-sites-output.js",
     "firmware:stage": "node scripts/stage-firmware-release.js",
     "firmware:preview": "node scripts/stage-local-firmware-preview.js",
+    "postinstall": "node scripts/patch-vinext-image-size.js",
+    "audit:dependencies": "npm audit --audit-level=high",
     "licenses:web": "node scripts/generate-website-third-party-licenses.js --check",
     "start": "vinext start",
     "lint": "eslint . --max-warnings=0",
@@ -22,7 +24,7 @@
     "test:watch": "vitest",
     "vinext:check": "vinext check",
     "format:check": "prettier --check .",
-    "check": "npm run format:check && npm run lint && npm run typecheck && npm run licenses:web && npm test && npm run vinext:check && npm run build"
+    "check": "npm run format:check && npm run lint && npm run typecheck && npm run audit:dependencies && npm run licenses:web && npm test && npm run vinext:check && npm run build"
   },
   "dependencies": {
     "@material/web": "2.2.0",
@@ -31,7 +33,7 @@
     "react": "19.2.8",
     "react-dom": "19.2.8",
     "react-server-dom-webpack": "19.2.8",
-    "vinext": "1.0.0-beta.4"
+    "vinext": "1.0.0-beta.8"
   },
   "devDependencies": {
     "@eslint/js": "10.0.1",
@@ -42,7 +44,7 @@
     "@types/react": "19.2.17",
     "@types/react-dom": "19.2.3",
     "@vitejs/plugin-react": "6.0.4",
-    "@vitejs/plugin-rsc": "0.5.32",
+    "@vitejs/plugin-rsc": "0.5.34",
     "eslint": "10.8.0",
     "eslint-plugin-react-hooks": "7.1.1",
     "globals": "17.8.0",

tools/web/package.json

@@ -3403,23 +3403,6 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-================================================================================
-image-size 2.0.2
-Installed path: node_modules/image-size
-SPDX license: MIT
-Source: https://registry.npmjs.org/image-size/-/image-size-2.0.2.tgz
-License file: LICENSE
-
-The MIT License (MIT)
-
-Copyright © 2013-Present Aditya Yadav, http://netroy.in
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 ================================================================================
 improv-wifi-serial-sdk 2.8.0
 Installed path: node_modules/improv-wifi-serial-sdk
@@ -5097,10 +5080,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 ================================================================================
-vinext 1.0.0-beta.4
+vinext 1.0.0-beta.8
 Installed path: node_modules/vinext
 SPDX license: MIT
-Source: https://registry.npmjs.org/vinext/-/vinext-1.0.0-beta.4.tgz
+Source: https://registry.npmjs.org/vinext/-/vinext-1.0.0-beta.8.tgz
 License file: LICENSE
 
 MIT License
@@ -5450,3 +5433,32 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+================================================================================
+image-size 2.0.2 (bundled by vinext 1.0.0-beta.8)
+Bundled path: node_modules/vinext/dist/deps/.pnpm/image-size@2.0.2/deps/image-size/dist/index.js
+SPDX license: MIT
+Source: https://registry.npmjs.org/image-size/-/image-size-2.0.2.tgz
+License file: reviewed image-size@2.0.2 package LICENSE
+
+The MIT License (MIT)
+
+Copyright © 2013-Present Aditya Yadav, http://netroy.in
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

tools/web/public/WEBSITE_THIRD_PARTY_LICENSES.txt

@@ -97,6 +97,23 @@ const reviewedLicenseSources = {
     path: "node_modules/lightningcss/LICENSE",
   },
 };
+const bundledProductionDependencies = [
+  {
+    ownerPath: "node_modules/vinext",
+    ownerVersion: "1.0.0-beta.8",
+    name: "image-size",
+    version: "2.0.2",
+    bundledPath:
+      "node_modules/vinext/dist/deps/.pnpm/image-size@2.0.2/deps/image-size/dist/index.js",
+    license: "MIT",
+    source: "https://registry.npmjs.org/image-size/-/image-size-2.0.2.tgz",
+    licenseName: "reviewed image-size@2.0.2 package LICENSE",
+    licenseText: mitLicense(
+      "Copyright © 2013-Present Aditya Yadav, http://netroy.in",
+      "The MIT License (MIT)",
+    ),
+  },
+];
 
 function packageNameFromPath(packagePath) {
   const marker = "node_modules/";
@@ -303,6 +320,29 @@ export async function generateWebsiteThirdPartyLicenses() {
     );
   }
 
+  for (const bundled of bundledProductionDependencies) {
+    const owner = lock.packages[bundled.ownerPath];
+    if (owner?.version !== bundled.ownerVersion) {
+      throw new Error(
+        `Reviewed bundled dependency record is stale for ${bundled.ownerPath}@${owner?.version ?? "missing"}`,
+      );
+    }
+    await readFile(join(packageRoot, bundled.bundledPath), "utf8");
+    records.push(
+      [
+        "================================================================================",
+        `${bundled.name} ${bundled.version} (bundled by vinext ${bundled.ownerVersion})`,
+        `Bundled path: ${bundled.bundledPath}`,
+        `SPDX license: ${bundled.license}`,
+        `Source: ${bundled.source}`,
+        `License file: ${bundled.licenseName}`,
+        "",
+        bundled.licenseText,
+        "",
+      ].join("\n"),
+    );
+  }
+
   return [
     "PyBLE website third-party notices",
     "====================================",

tools/web/scripts/generate-website-third-party-licenses.js

@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: MIT
+// Part of PyBLE (https://pyble.dev) — see /LICENSE.
+
+import { readFile, writeFile } from "node:fs/promises";
+import { join, resolve } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+const packageRoot = fileURLToPath(new URL("..", import.meta.url));
+const bundledParserPath = join(
+  packageRoot,
+  "node_modules",
+  "vinext",
+  "dist",
+  "deps",
+  ".pnpm",
+  "image-size@2.0.2",
+  "deps",
+  "image-size",
+  "dist",
+  "index.js",
+);
+
+const hardeningEdits = [
+  {
+    advisory: "GHSA-w3rx-r6r6-pgpr",
+    before:
+      "\t\t\tconst imageHeader = readImageHeader(input, imageOffset);\n\t\t\tconst imageSize2 = getImageSize2(imageHeader[0]);",
+    after:
+      '\t\t\tconst imageHeader = readImageHeader(input, imageOffset);\n\t\t\tif (imageHeader[1] <= 0) throw new TypeError("Invalid ICNS, zero-length image entry");\n\t\t\tconst imageSize2 = getImageSize2(imageHeader[0]);',
+  },
+  {
+    advisory: "GHSA-5p2g-fcmc-qvqq (HEIF)",
+    before:
+      '\t\t\tconst ispeBox = findBox(input, "ispe", currentOffset);\n\t\t\tif (!ispeBox) break;\n\t\t\tconst rawWidth = readUInt32BE(input, ispeBox.offset + 12);',
+    after:
+      '\t\t\tconst ispeBox = findBox(input, "ispe", currentOffset);\n\t\t\tif (!ispeBox) break;\n\t\t\tif (ispeBox.size <= 0) throw new TypeError("Invalid HEIF, zero-length ispe box");\n\t\t\tconst rawWidth = readUInt32BE(input, ispeBox.offset + 12);',
+  },
+  {
+    advisory: "GHSA-5p2g-fcmc-qvqq (JXL)",
+    before:
+      '\t\tconst jxlpBox = findBox(input, "jxlp", offset);\n\t\tif (!jxlpBox) break;\n\t\tpartialStreams.push(input.slice(jxlpBox.offset + 12, jxlpBox.offset + jxlpBox.size));',
+    after:
+      '\t\tconst jxlpBox = findBox(input, "jxlp", offset);\n\t\tif (!jxlpBox) break;\n\t\tif (jxlpBox.size <= 0) throw new TypeError("Invalid JXL, zero-length jxlp box");\n\t\tpartialStreams.push(input.slice(jxlpBox.offset + 12, jxlpBox.offset + jxlpBox.size));',
+  },
+];
+
+/**
+ * @param {string} source
+ * @returns {string}
+ */
+export function hardenBundledImageSize(source) {
+  let hardened = source;
+  for (const edit of hardeningEdits) {
+    const hardenedOccurrences = hardened.split(edit.after).length - 1;
+    const vulnerableOccurrences = hardened.split(edit.before).length - 1;
+    if (hardenedOccurrences === 1 && vulnerableOccurrences === 0) {
+      continue;
+    }
+    if (hardenedOccurrences !== 0 || vulnerableOccurrences !== 1) {
+      throw new Error(
+        `Cannot apply ${edit.advisory} hardening: found ${vulnerableOccurrences} vulnerable and ${hardenedOccurrences} hardened matches`,
+      );
+    }
+    hardened = hardened.replace(edit.before, edit.after);
+  }
+  return hardened;
+}
+
+async function run() {
+  const source = await readFile(bundledParserPath, "utf8");
+  const hardened = hardenBundledImageSize(source);
+  if (hardened !== source) {
+    await writeFile(bundledParserPath, hardened, "utf8");
+  }
+}
+
+const invokedPath = process.argv[1];
+if (
+  invokedPath &&
+  import.meta.url === pathToFileURL(resolve(invokedPath)).href
+) {
+  run().catch((error) => {
+    console.error(error instanceof Error ? error.message : error);
+    process.exitCode = 1;
+  });
+}