chore(deps): update dependency electron to v41 [security]

2026-10-10 11:39:50 +08:00 · 2026-10-06 00:58:25 +00:00
6 changed files with 59 additions and 237 deletions
@@ -163,16 +163,6 @@ AI_MODEL=global.anthropic.claude-sonnet-4-5-20250929-v1:0
 # Set to "false" to block private IPs, localhost, and internal hostnames
 # ALLOW_PRIVATE_URLS=false

-# Behind a CDN such as Cloudflare (Optional)
-# The daily quota is counted per IP. By default the IP is the first
-# X-Forwarded-For entry, which visitors can set to anything. Name the header
-# your CDN fills with the visitor's real IP instead:
-# CLIENT_IP_HEADER=cf-connecting-ip
-# Then have the CDN add an X-Origin-Secret header with this value to every
-# request. API calls without it get 403, so nobody can skip the CDN and fake
-# the IP header above.
-# ORIGIN_SECRET=a-long-random-string
-
 # Self-hosted deployment (Optional)
 # Self-hosted users may implement custom quota-management solutions,
 # which triggers the client UI to display messages suggesting self-hosting or sponsorship.
@@ -2,19 +2,10 @@
 * Generate a userId from request for tracking purposes.
 * Uses base64url encoding of IP for URL-safe identifier.
 * Note: base64 is reversible - this is NOT privacy protection.
- *
- * The first X-Forwarded-For entry is whatever the visitor sent, so behind a
- * CDN set CLIENT_IP_HEADER to the header it fills with the real IP (e.g.
- * cf-connecting-ip), and ORIGIN_SECRET so requests that skip the CDN are
- * refused (see proxy.ts).
 */
 export function getUserIdFromRequest(req: Request): string {
-    const ipHeader = process.env.CLIENT_IP_HEADER
-    const rawIp =
-        (ipHeader
-            ? req.headers.get(ipHeader)?.trim()
-            : req.headers.get("x-forwarded-for")?.split(",")[0]?.trim()) ||
-        "anonymous"
+    const forwardedFor = req.headers.get("x-forwarded-for")
+    const rawIp = forwardedFor?.split(",")[0]?.trim() || "anonymous"
    return rawIp === "anonymous"
        ? rawIp
        : `user-${Buffer.from(rawIp).toString("base64url")}`
@@ -93,7 +93,7 @@
                "@vitest/coverage-v8": "^4.0.16",
                "concurrently": "^9.2.1",
                "cross-env": "^10.1.0",
-                "electron": "^39.2.7",
+                "electron": "^41.0.0",
                "electron-builder": "^26.0.12",
                "esbuild": "^0.28.0",
                "eslint": "9.39.5",
@@ -2564,6 +2564,16 @@
                "@noble/ciphers": "^1.0.0"
            }
        },
+        "node_modules/@electron-internal/extract-zip": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/@electron-internal/extract-zip/-/extract-zip-1.0.5.tgz",
+            "integrity": "sha512-+bqFCP98pLI0Tt0XQo1TmlXtwjWchISndDOxCkEcIuUgXWpBnLyRI+2DU+mesvnMMX6L1XDqYNA0lXNDHd/yiA==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=22.12.0"
+            }
+        },
        "node_modules/@electron/asar": {
            "version": "3.4.1",
            "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz",
@@ -2746,25 +2756,50 @@
            }
        },
        "node_modules/@electron/get": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
-            "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@electron/get/-/get-5.1.0.tgz",
+            "integrity": "sha512-3kSBtG8ObcTVfXanm5vVJ6UnBLEVmVsRk1M+vGqCuMBV+XLCbJYuWQful+yIy0GQDsSlK0kHEriEHn7SPk4EnA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
                "debug": "^4.1.1",
-                "env-paths": "^2.2.0",
-                "fs-extra": "^8.1.0",
-                "got": "^11.8.5",
+                "env-paths": "^3.0.0",
+                "graceful-fs": "^4.2.11",
                "progress": "^2.0.3",
-                "semver": "^6.2.0",
+                "semver": "^7.6.3",
                "sumchecker": "^3.0.1"
            },
            "engines": {
-                "node": ">=12"
+                "node": ">=22.12.0"
            },
            "optionalDependencies": {
-                "global-agent": "^3.0.0"
+                "undici": "^7.24.4"
+            }
+        },
+        "node_modules/@electron/get/node_modules/env-paths": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",
+            "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@electron/get/node_modules/semver": {
+            "version": "7.8.5",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+            "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
            }
        },
        "node_modules/@electron/notarize": {
@@ -8578,17 +8613,6 @@
            "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
            "license": "MIT"
        },
-        "node_modules/@types/yauzl": {
-            "version": "2.10.3",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-            "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
        "node_modules/@typescript-eslint/eslint-plugin": {
            "version": "8.56.1",
            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz",
@@ -10281,16 +10305,6 @@
                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
            }
        },
-        "node_modules/buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "*"
-            }
-        },
        "node_modules/buffer-equal-constant-time": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
@@ -11844,22 +11858,22 @@
            }
        },
        "node_modules/electron": {
-            "version": "39.8.10",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-39.8.10.tgz",
-            "integrity": "sha512-zbYtGPYUI7PzqLAzkk21Rk6j67WN0hxn0Mq/njErZo1d0HSf33is4f8ICI5fMLy5vYe0JtCtM5sYunNOaochSQ==",
+            "version": "41.10.7",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-41.10.7.tgz",
+            "integrity": "sha512-AqIiefddlf5i+HYCGatr8VlBuEbWJpad4/yloBFYcMB2r57j7xhW1ogiJ+BfA5kxQyfmSs5yjwy54Me+wJn1jw==",
            "dev": true,
            "hasInstallScript": true,
            "license": "MIT",
            "dependencies": {
-                "@electron/get": "^2.0.0",
-                "@types/node": "^22.7.7",
-                "extract-zip": "^2.0.1"
+                "@electron-internal/extract-zip": "^1.0.1",
+                "@electron/get": "^5.0.0",
+                "@types/node": "^24.9.0"
            },
            "bin": {
                "electron": "cli.js"
            },
            "engines": {
-                "node": ">= 12.20.55"
+                "node": ">= 22.12.0"
            }
        },
        "node_modules/electron-builder": {
@@ -12194,23 +12208,6 @@
                "node": ">=6 <7 || >=8"
            }
        },
-        "node_modules/electron/node_modules/@types/node": {
-            "version": "22.19.17",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.17.tgz",
-            "integrity": "sha512-wGdMcf+vPYM6jikpS/qhg6WiqSV/OhG+jeeHT/KlVqxYfD40iYJf9/AE1uQxVWFvU7MipKRkRv8NSHiCGgPr8Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "undici-types": "~6.21.0"
-            }
-        },
-        "node_modules/electron/node_modules/undici-types": {
-            "version": "6.21.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-            "dev": true,
-            "license": "MIT"
-        },
        "node_modules/emoji-regex": {
            "version": "9.2.2",
            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -13346,43 +13343,6 @@
            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
            "license": "MIT"
        },
-        "node_modules/extract-zip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-            "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "debug": "^4.1.1",
-                "get-stream": "^5.1.0",
-                "yauzl": "^2.10.0"
-            },
-            "bin": {
-                "extract-zip": "cli.js"
-            },
-            "engines": {
-                "node": ">= 10.17.0"
-            },
-            "optionalDependencies": {
-                "@types/yauzl": "^2.9.1"
-            }
-        },
-        "node_modules/extract-zip/node_modules/get-stream": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-            "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "pump": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
        "node_modules/fast-deep-equal": {
            "version": "3.1.3",
            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -13461,16 +13421,6 @@
                "reusify": "^1.0.4"
            }
        },
-        "node_modules/fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "pend": "~1.2.0"
-            }
-        },
        "node_modules/fdir": {
            "version": "6.5.0",
            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -13796,21 +13746,6 @@
                "node": ">= 0.8"
            }
        },
-        "node_modules/fs-extra": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-            "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^4.0.0",
-                "universalify": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=6 <7 || >=8"
-            }
-        },
        "node_modules/fs.realpath": {
            "version": "1.0.0",
            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -19163,13 +19098,6 @@
                "url": "https://github.com/sponsors/jet2jet"
            }
        },
-        "node_modules/pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-            "dev": true,
-            "license": "MIT"
-        },
        "node_modules/picocolors": {
            "version": "1.1.1",
            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -24055,17 +23983,6 @@
                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
            }
        },
-        "node_modules/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
-            }
-        },
        "node_modules/yocto-queue": {
            "version": "0.1.0",
            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -126,7 +126,7 @@
        "@vitest/coverage-v8": "^4.0.16",
        "concurrently": "^9.2.1",
        "cross-env": "^10.1.0",
-        "electron": "^39.2.7",
+        "electron": "^41.0.0",
        "electron-builder": "^26.0.12",
        "esbuild": "^0.28.0",
        "eslint": "9.39.5",
@@ -27,19 +27,9 @@ function getLocale(request: NextRequest): string | undefined {
 export function proxy(request: NextRequest) {
    const pathname = request.nextUrl.pathname

-    if (pathname.startsWith("/api/")) {
-        // With ORIGIN_SECRET set, API calls must come through the CDN that
-        // adds this header. A call straight to the origin could fake the
-        // CLIENT_IP_HEADER and get a fresh quota for every made-up IP.
-        const secret = process.env.ORIGIN_SECRET
-        if (secret && request.headers.get("x-origin-secret") !== secret) {
-            return NextResponse.json({ error: "Forbidden" }, { status: 403 })
-        }
-        return
-    }
-
-    // Skip static files and Next.js internals
+    // Skip API routes, static files, and Next.js internals
    if (
+        pathname.startsWith("/api/") ||
        pathname.startsWith("/_next/") ||
        pathname.startsWith("/drawio") ||
        pathname.includes("/favicon") ||
@@ -68,9 +58,6 @@ export function proxy(request: NextRequest) {
 }

 export const config = {
-    // API routes (for ORIGIN_SECRET), and pages without `/_next/` assets
-    matcher: [
-        "/api/:path*",
-        "/((?!api|_next/static|_next/image|favicon.ico).*)",
-    ],
+    // Matcher ignoring `/_next/` and `/api/`
+    matcher: ["/((?!api|_next/static|_next/image|favicon.ico).*)"],
 }
@@ -1,63 +0,0 @@
-import { NextRequest } from "next/server"
-import { afterEach, describe, expect, it } from "vitest"
-import { getUserIdFromRequest } from "@/lib/user-id"
-import { proxy } from "@/proxy"
-
-const idFor = (ip: string) => `user-${Buffer.from(ip).toString("base64url")}`
-
-afterEach(() => {
-    delete process.env.CLIENT_IP_HEADER
-    delete process.env.ORIGIN_SECRET
-})
-
-describe("getUserIdFromRequest", () => {
-    const req = new Request("http://localhost/api/chat", {
-        headers: {
-            "x-forwarded-for": "203.0.113.9, 198.51.100.7",
-            "cf-connecting-ip": "198.51.100.7",
-        },
-    })
-
-    it("uses the first X-Forwarded-For entry by default", () => {
-        expect(getUserIdFromRequest(req)).toBe(idFor("203.0.113.9"))
-    })
-
-    it("uses CLIENT_IP_HEADER when set", () => {
-        process.env.CLIENT_IP_HEADER = "cf-connecting-ip"
-        expect(getUserIdFromRequest(req)).toBe(idFor("198.51.100.7"))
-    })
-
-    it("is anonymous when the configured header is missing", () => {
-        process.env.CLIENT_IP_HEADER = "cf-connecting-ip"
-        expect(
-            getUserIdFromRequest(new Request("http://localhost/api/chat")),
-        ).toBe("anonymous")
-    })
-})
-
-describe("ORIGIN_SECRET", () => {
-    const call = (path: string, secret?: string) =>
-        proxy(
-            new NextRequest(`http://localhost${path}`, {
-                headers: secret ? { "x-origin-secret": secret } : {},
-            }),
-        )
-
-    it("lets every API call through when unset", () => {
-        expect(call("/api/chat")).toBeUndefined()
-    })
-
-    it("refuses API calls without the right header", async () => {
-        process.env.ORIGIN_SECRET = "s3cret"
-        for (const res of [call("/api/chat"), call("/api/chat", "wrong")]) {
-            expect(res?.status).toBe(403)
-        }
-        expect(call("/api/chat", "s3cret")).toBeUndefined()
-    })
-
-    it("leaves pages alone, such as the health check on /", () => {
-        process.env.ORIGIN_SECRET = "s3cret"
-        expect(call("/")?.status).toBe(307)
-        expect(call("/en")).toBeUndefined()
-    })
-})